added death and scene transitions
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/components/Punch.js
	scripts/scenes/test.js
added death and scene transitions