Merge pull request #2 from GamesCrafters/settings-page

Update game state stack.
working on stuff
Merge branch 'master' into settings-page

Conflicts:
	assets/javascripts/GCAPI.coffee
	assets/javascripts/ui.coffee