Start Game Options 1 and 2 pages. I didn't change anything in these ionic directories but they show as modified so I'm checking them in.
Fix some merge conflicts
Add hanziOptions and deckOptions pages, restore nav bar, hide nav bar on login page
Add navicon for navbar and new style to css file and new classes in hanziOptions and deckOptions
Merge pull request #21 from mellema/master

Game options pages 1 and 2