JG
Added Rooms

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

Conflicts:
	TeamBravoProject/Assembly-UnityScript-firstpass-vs.unityproj
	TeamBravoProject/Assembly-UnityScript-firstpass.unityproj
	TeamBravoProject/Assets/Materials.meta
	TeamBravoProject/Assets/Standard Assets.meta
	TeamBravoProject/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta
	TeamBravoProject/Library/AssetServerCacheV3
	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-UnityScript-firstpass.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/expandedItems
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	TeamBravoProject/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	TeamBravoProject/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	TeamBravoProject/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	TeamBravoProject/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	TeamBravoProject/Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	TeamBravoProject/Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	TeamBravoProject/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	TeamBravoProject/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	TeamBravoProject/Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	TeamBravoProject/Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	TeamBravoProject/Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	TeamBravoProject/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	TeamBravoProject/Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	TeamBravoProject/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	TeamBravoProject/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	TeamBravoProject/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	TeamBravoProject/Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	TeamBravoProject/TeamBravoProject.userprefs