final commit from wes
Merge branch 'master' of github.com:wesleytsai/goodgame

Conflicts:
	main.js