getting ready
farts
farts again
lots of shit
Merge branch 'master' of https://github.com/HolyShitCollective/GMA

Conflicts:
	lib/game/entities/player.js
	lib/game/entities/projectile.js
farts: