LogoPNG Aangepast
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop
Logo gekloot enzo
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Models/Enemies/Orc/enemyOrcWithWep10.blend.meta
	Assets/Models/Enemies/Orc/enemyOrcWithWep11.blend.meta
	Assets/Models/Enemies/Orc/enemyOrcWithWep11.blend1.meta
	Assets/Models/Tower&TrapsModels/Materials/Material_001__spearThingyUV_Texture_png.mat.meta~HEAD.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/WallTower_magic.blend1.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta
	Assets/Scripts/bin.meta
	Assets/Scripts/bin/Debug.meta
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop