STUFF
Merge branch 'master' of https://github.com/HolyShitCollective/GMA

Conflicts:
	lib/game/entities/player.js