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

Conflicts:
	Assets/Resources/Prefabs/Arena/ArenaAssets/barnjoined.prefab
	ProjectSettings/EditorBuildSettings.asset