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/Assets/Scene1.unity
	cs113Project/Library/CurrentLayout.dwlt
	cs113Project/Library/CurrentMaximizeLayout.dwlt
	cs113Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	cs113Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	cs113Project/Library/assetDatabase3
	cs113Project/Library/expandedItems
	cs113Project/Library/guidmapper
	cs113Project/Library/metadata/a0/a02e2eb6cd5a04caab313cc2eb0a97a0
	cs113Project/cs113Project-csharp.sln
	cs113Project/cs113Project.sln
	cs113Project/cs113Project.userprefs