minye second commit
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/main.js
Merge branch 'master' of https://github.com/hongkunyoo/gonexon
Merge branch 'master' of https://github.com/hongkunyoo/gonexon
finished coin
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/main.js