Enemys gaan nu beter dood
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Models/Enemies/GoblinGuy/goblinModelblend2_UV copy.png.meta
	Assets/Models/Enemies/GoblinGuy/goblinModelblend5.blend.meta
	Assets/Models/Tower&TrapsModels/HS_WallTower_magic.fbm.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta
	Assets/Sprites/GUI/GUI2.psd.meta
	TD_Data/Managed/Assembly-CSharp.dll
	TD_Data/PlayerConnectionConfigFile
	TD_Data/mainData
	TD_Data/output_log.txt
	TD_Data/sharedassets0.assets