Death added, still buggy.
Merge branch 'master' of https://github.com/T-and-T/LD26

Conflicts:
	js/game.js
	js/playerentity.js