Minimap af:)
Merge branch 'master' of https://github.com/groep10/game

Conflicts:
	Assets/Resources/Standard Assets/Terrain Assets/Terrain Textures/Materials/Cliff (Layered Rock) 1.mat.meta