player death
Merge branch 'playerdeath'

Conflicts:
	shooter/js/Main.js