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

Conflicts:
	lib/game/main.js
before editting erron on block
commit 2(before editting block)
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/main.js