Commit
...
...
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/InspectorExpandedItems.asset
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll

	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb

	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	TeamBravoProject/Library/assetDatabase3