dfactor en geprobeerd respawn
Merge branch 'Tiamur' into develop

Conflicts:
	Assets/Models/Tower&TrapsModels/IceTrap/IceTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta~HEAD_0.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta~HEAD_1.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta~Job.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta~Tiamur.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta~HEAD.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta~HEAD_0.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta~Job.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta~HEAD.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta~Job.meta
	Assets/Prefabs/Spawners/EnemySpawner.prefab
	Assets/Scripts/EnemyHealth.cs
	Assets/Scripts/WaveSpawner.cs
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Models/Tower&TrapsModels/IceTrap/IceTrap.fbm.meta
	Assets/Prefabs/Spawners/EnemySpawner.prefab