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

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/InspectorExpandedItems.asset
	Unity Project/Library/assetDatabase3
	Unity Project/Library/expandedItems
	Unity Project/Library/guidmapper
Merge branch 'master' of https://github.com/Caster123/CS3247Project
nothing changes
Merge branch 'master' of https://github.com/Caster123/CS3247Project

Conflicts:
	Unity Project/Library/assetDatabase3
	Unity Project/Library/guidmapper
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
changed background