Comitting to sync with newest version
Merge branch 'master' of https://github.com/RasmusBlind/Zompire

Conflicts:
	Zompire2D/Assets/prefab/Enemy.prefab
	Zompire2D/Assets/prefab/ideal mexican player.prefab