Fixes

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs

Some Clarity