die animation, fixed animation fuckup, other stuff
Merge branch 'master' of https://github.com/Slin/glow

Conflicts:
	game/aPlayer.js
fixed merge errors