Goal voor leon
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Materials.meta~cab2a81f1037517937990fc29ecd13591fdea913
	Assets/Models/Tower&TrapsModels/FireTrap/HS_fireTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/HS_SpearTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/IceTrap/Hs_IceTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/WallTower_final.fbm.meta
	Assets/Models/Tower&TrapsModels/WallTower_final2.fbm.meta
	Assets/Scripts/bin.meta
	Assets/Sprites/GUI/FilledInGui.psd.meta