aa
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/entities/player.js
shut up
sh
Jin
gooMerge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/entities/player.js
	lib/game/main.js
	lib/game/managers/itemManager.js