Working on merging files.
Merge branch 'master' of https://github.com/groep10/game

Conflicts:
	Assets/Scenes/Koen - Main Menu.unity
Remove meta files