Current Layout
Merged two different versions.

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

Conflicts:
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/metadata/3d/3d9250ee4414e684999928217a7aa30b
	TeamBravoProject/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	TeamBravoProject/TeamBravoProject.userprefs