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

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/assetDatabase3
	Unity Project/Library/expandedItems
	Unity Project/Library/guidmapper