Resources map gecreeerd
Merge branch 'master' of https://github.com/groep10/game
Merge branch 'master' of https://github.com/groep10/game
vuur moet gewoon gaan werken
Merge branch 'master' of https://github.com/groep10/game

Conflicts:
	Assets/Prefabs/Arena/fire.mat.meta