commit for pull
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/main.js