refactoring
Merge branch 'wes' of github.com:wesleytsai/goodgame into wes

Conflicts:
	js/GameStateMachine.js