merge
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	Makefile
	damncute/Core/Hitbox.cpp
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
add explosion animation
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype