Revert ea115d8..f899ec4

This rolls back to commit ea115d8035ef0801e4d1cd3a3dfcefc14a14d0be.
rollback and nav update
userstate
Merge branch 'master' of https://github.com/MobileApps-Cascadia/Doug-Spellz

Conflicts:

Spellz/Spellz.xcodeproj/project.xcworkspace/xcuserdata/douglasanderson.x
cuserdatad/UserInterfaceState.xcuserstate