Enemy kan speler doden (nog niet helemaal af)
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into Tiamur

Conflicts:
	Assets/Models/Decorations.meta
	Assets/Models/MainChar/Materials/FinalUVTexture 6.mat.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/Trap1Example.fbm.meta
Paar errors gefixt
Paar errors gefixt
Merge commit 'abcb8c51d4f524534a45fe8c2020d07072e775d8' into develop
Merge branch 'Tiamur' into develop
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/Trap1Example.fbm.meta
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Scripts/EnemyMovement.cs.meta~HEAD.meta
	Assets/Scripts/EnemyMovement.cs.meta~eaf1eb3ca0fdd82ccc7ac2e03407e2279256226a.meta
	Assets/Scripts/EnemyScript.cs.meta~HEAD_0.meta
	Assets/Scripts/EnemyScript.cs.meta~eaf1eb3ca0fdd82ccc7ac2e03407e2279256226a.meta
	Assets/Scripts/bin.meta