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

Conflicts:
	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/metadata/cc/cc85358121e344dd39fb5c7129aca87b
	cs113Project/cs113Project-csharp.sln
	cs113Project/cs113Project.sln
	cs113Project/cs113Project.userprefs