Merge pull request #51 from JoeDou/dev

Update with bug fixes and comments
Merge branch 'master' of https://github.com/JoeDou/Famo.us-Monospace into masterBackup
edited with linter suggestions
changed button location based on window size
Merge pull request #54 from theamarpatel/master

updated button location
Merge branch 'dev' of https://github.com/JoeDou/Famo.us-Monospace into joeDev2

Conflicts:
	app/src/views/GameLogic.js