zombies now have health
Merge branch 'master' of https://github.com/Rkaede/GenericTowerDefence

Conflicts:
	src/js/scenes/level1.js