nogit-sync merge

diff --cc TODO
index 430f5b810624711f38efaa7427e0a74c3a50e412,d147f100423ecd0ac0f1affdc8b9a0585c0f3151..d262eb1cd09a4728c0caa3091d36bcf45f0593c0
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -22,7 -22,7 +22,8 @@@ Features (likely) requiring only clien
  
  Add a TWINNER achievement
  
 +Add support for an initial number spelled out, such as "three little words"
+ Add support for item counts as words
  
  Allow clients to see previous round scores by swiping left