Removed commented code
Merge branch 'master' of https://github.com/Agnostic/js-morpg
Merge branch 'master' of https://github.com/Agnostic/js-morpg

Conflicts:
	public/js/entities/player.js
Fixed merged changes