ugly working explosion
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	Makefile
	src/Player.hh