sync
Merge branch 'master' of https://github.com/JordanLingHua/cs113Project

Conflicts:
	cs113Project/Assembly-CSharp-firstpass-vs.csproj
	cs113Project/Assembly-CSharp-firstpass.csproj
	cs113Project/Assembly-CSharp-vs.csproj
	cs113Project/Assembly-CSharp.csproj
	cs113Project/Assembly-UnityScript-firstpass-vs.unityproj
	cs113Project/Assembly-UnityScript-firstpass.unityproj
	cs113Project/Library/CurrentMaximizeLayout.dwlt
	cs113Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	cs113Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	cs113Project/Library/assetDatabase3
	cs113Project/Library/guidmapper
	cs113Project/Library/metadata/14/144c6728dfecd43bcb8874428518ea39
	cs113Project/Library/metadata/17/17a71e9855337429eb7d4c555ebd8eb5
	cs113Project/Library/metadata/75/753010a83d1d049d8ac934601620ee23
	cs113Project/Library/metadata/cc/cc85358121e344dd39fb5c7129aca87b
	cs113Project/Library/metadata/fa/faf89815d05804691a2b8466ca7579e0
	cs113Project/cs113Project-csharp.sln
	cs113Project/cs113Project.sln