Game over and health
Merge branch 'master' of https://github.com/Nuggetsandclide/2D-Game.git

Conflicts:
	src/Step3.java