nieuwe menu met inlog
Move all the things
Merge branch 'master' of https://github.com/groep10/game

Conflicts:
	Assets/LogInButton.controller
	Assets/Resources/Prefabs/Koen/Koen Invasion.meta
	Assets/Resources/Prefabs/Koen/Koen Invasion/GrassTexture01.jpg
	Assets/Resources/Prefabs/Koen/Koen Invasion/GrassTexture01.jpg.meta
	Assets/Resources/Prefabs/Koen/Koen Invasion/Sphere.prefab
	Assets/Resources/Prefabs/Koen/Koen Invasion/Sphere.prefab.meta
	Assets/Resources/Prefabs/Koen/Koen Invasion/bullet.prefab
	Assets/Resources/Prefabs/Koen/Koen Invasion/bullet.prefab.meta
	Assets/Resources/Prefabs/Koen/Koen Main.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/HIGH1BACKBUT.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/HIGH1BACKBUT.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1allbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1allbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1credbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1credbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1highbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1highbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1optbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1optbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1playbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1playbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1quitbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/MAIN1quitbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/Main Menu.controller
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/Main Menu.controller.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/highbut.anim
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/highbut.anim.meta
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/menu open.anim
	Assets/Resources/Prefabs/Koen/Koen Main/Buttons/menu open.anim.meta
	Assets/Resources/Prefabs/Koen/Koen Main/CredButton.controller.meta
	Assets/Resources/Prefabs/Koen/Koen Main/HIGH1allbut.psd
	Assets/Resources/Prefabs/Koen/Koen Main/HIGH1allbut.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/HighButton.controller
	Assets/Resources/Prefabs/Koen/Koen Main/HighButton.controller.meta
	Assets/Resources/Prefabs/Koen/Koen Main/MAIN1.psd
	Assets/Resources/Prefabs/Koen/Koen Main/MAIN1.psd.meta
	Assets/Resources/Prefabs/Koen/Koen Main/OptButton.controller
	Assets/Resources/Prefabs/Koen/Koen Main/OptButton.controller.meta
	Assets/Resources/Prefabs/Koen/Koen Main/playButton.controller
	Assets/Resources/Prefabs/Koen/Koen Main/playButton.controller.meta
	Assets/Resources/Scripts/Joseph/HTTP/ResponseCallbackDispatcher.cs.meta
	Assets/Resources/Scripts/Koen/Koen - Main.meta
	Assets/Resources/Scripts/Koen/Koen - Main/Main Menu empty.anim
	Assets/Resources/Scripts/Koen/Koen - Main/Main Menu empty.anim.meta
	Assets/Resources/Scripts/Koen/Koen - Main/Menu.cs
	Assets/Resources/Scripts/Koen/Koen - Main/Menu.cs.meta
	Assets/Resources/Scripts/Koen/Koen - Main/MenuManager.cs
	Assets/Resources/Scripts/Koen/Koen - Main/MenuManager.cs.meta
	Assets/Resources/Scripts/Koen/Koen Invasion.meta
	Assets/Resources/Scripts/Koen/Koen Invasion/AIEnemy.cs
	Assets/Resources/Scripts/Koen/Koen Invasion/AIEnemy.cs.meta
	Assets/Resources/Scripts/Koen/Koen Invasion/EnemyManage.cs
	Assets/Resources/Scripts/Koen/Koen Invasion/EnemyManage.cs.meta
	Assets/Resources/Scripts/Koen/Koen Invasion/FPSWalkerEnhanced.js
	Assets/Resources/Scripts/Koen/Koen Invasion/FPSWalkerEnhanced.js.meta
	Assets/Resources/Scripts/Koen/Koen Invasion/Fire.cs
	Assets/Resources/Scripts/Koen/Koen Invasion/Fire.cs.meta
	Assets/Resources/Scripts/Koen/Koen Invasion/Kill.cs
	Assets/Resources/Scripts/Koen/Koen Invasion/Kill.cs.meta
	Assets/Resources/Scripts/Koen/cm.cs
	Assets/Resources/Scripts/Koen/cm.cs.meta
	Assets/Scripts/Koen - Main/Menu.cs.meta