comit
player rocketswitch ( alleen nog boolean fixe )
dfasf
Merge branch 'master' of https://github.com/Team-201-c/Master
kut kut kut kut kut github
Conflicts:
	mainproject/Assets/Scenes/mission 1.unity
	mainproject/Assets/Scripts/Mission 1/CameraShake.cs
	mainproject/Library/CurrentLayout.dwlt
	mainproject/Library/CurrentMaximizeLayout.dwlt
	mainproject/Library/InspectorExpandedItems.asset
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	mainproject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	mainproject/Library/assetDatabase3
	mainproject/Library/expandedItems
	mainproject/Library/guidmapper
	mainproject/Library/metadata/3a/3ad59c86f31800c469ea57833930cbd9
	mainproject/Library/metadata/5c/5c947f3bb9fc36449ac8fc9c72cd0f09
	mainproject/Library/metadata/87/8769af03d751a26429e11304b328c40e
	mainproject/Library/metadata/9e/9e050e288d2185f45a36abb30c679913
	mainproject/Library/metadata/bc/bc1c9eff04bec4847bb3dd602f52d400
	mainproject/Library/metadata/e8/e83c573f80515b145a5531eaa82bb943
	mainproject/mainproject-csharp.sln
	mainproject/mainproject.sln
	mainproject/mainproject.userprefs