Game and Scene Manager
Merge

Conflicts:
	FirstDrafProj/Assets/Scenes/MainScene.unity
	FirstDrafProj/FirstDrafProj.userprefs
	FirstDrafProj/Library/CurrentMaximizeLayout.dwlt
	FirstDrafProj/Library/ScriptAssemblies/Assembly-CSharp.dll
	FirstDrafProj/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	FirstDrafProj/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll

FirstDrafProj/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.m
db
	FirstDrafProj/Library/assetDatabase3
	FirstDrafProj/Library/metadata/4b/4b179b5e1cf0748a8a41a6470e50c69e
	FirstDrafProj/Library/shadercompiler-1.log