Update
Merge branch 'master' of https://github.com/RasmusBlind/Zompire

Conflicts:
	Zompire2D/Assets/prefab/Enemy.prefab
	Zompire2D/Assets/scripts/BloodSplash.cs