Merge pull request #20 from gitMbar/master

Add comments to friends page and controller
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
server skeleton
Add mongoose schemae
editing package.json
Merge pull request #22 from wcjohnson11/will-server

Will server
configure server
Merge pull request #23 from wcjohnson11/group-server

configure server
implement basic server
configure server to serve static html
prepare for deployment
Merge pull request #24 from wcjohnson11/group-server

Group server
refactor server
Merge pull request #25 from wcjohnson11/group-server

refactor server
edit config.xml
Merge pull request #26 from wcjohnson11/group-server

edit config.xml