Update
update
Merge branch 'master' of https://github.com/Caster123/CS3247Project

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity Project/Library/assetDatabase3
	Unity Project/Library/guidmapper
	Unity Project/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Unity Project/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	Unity Project/Library/metadata/bd/bdf28100e240eee4eb83f8c9569a8bd4
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln