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

Conflicts:
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/CurrentMaximizeLayout.dwlt
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	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/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/08/08737ec9735d2e94ca75770362fe1a39
	TeamBravoProject/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	TeamBravoProject/Library/metadata/f6/f6897e26fd63d6e4aa8d6bcb166cb43b
	TeamBravoProject/Temp/ExportedFBXFile.fbx
	TeamBravoProject/Temp/FBXMayaExport.mel
	TeamBravoProject/Temp/FBXMayaExport5.mel
	TeamBravoProject/Temp/FBXMayaMain.mel
	TeamBravoProject/Temp/__EditModeScene