Fixed parenteses on solo x's
Fixed NPE in NumberSelectScreen

Whoops, should have switched and done this fix here, then merged to
story.  There might be a conflict now, but it's the same fix.
updated .gitignore
Merge commit 'd1277c' into release
Merge commit 'd1965a' into release