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

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

Conflicts:
	lib/game/main.js