kut sourcetree beter doe je het
Revert "Revert ".""

This reverts commit 9964f6e92575edca5f8c007ae9cd13a5baf6c63a.
hop
Merge branch 'mees' into develop

Conflicts:
	Assets/Models/Decorations/Materials/Material_002.mat.meta
	Assets/Models/Decorations/Materials/Material_005.mat.meta
	Assets/Models/Decorations/Materials/Material_006.mat.meta
	Assets/Models/MainChar/Materials/FinalUVTexture 6.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/Material_003.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/SpearUV copy.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/spearTrapUv_Texture.mat.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/Trap1Example.fbm.meta
	Assets/Models/Tower&TrapsModels/spearTrap.blend.meta
	Assets/Prefabs/Character Models/Enemy.prefab
	Assets/Scenes/Prototype Level using navmesh.unity
	Assets/Scripts/AstarPath.cs.meta
	Assets/Scripts/EnemyAttack.cs
	Assets/Scripts/EnemyHealth.cs
	Assets/Scripts/EnemyMovement.cs
	Assets/Scripts/EnemyMovement.cs.meta
	Assets/Scripts/EnemyScript.cs
	Assets/Scripts/Navigator.cs
	Assets/Scripts/PlayerHealth.cs
	Assets/Scripts/RandomMaze.cs
	Assets/Scripts/WaveSpawner.cs
	Assets/Scripts/WaveSpawner.cs.meta
	Assets/UnityVS.meta
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
	ProjectSettings/TagManager.asset