saving things before I can merge stuff
merging conflicts

Conflicts:
	FirstDrafProj/FirstDrafProj-csharp.sln
	FirstDrafProj/FirstDrafProj.sln
	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/8e/8efd8dc3aea754f69a763c427e41e2bc
	FirstDrafProj/Library/shadercompiler-1.log