Add room Script
Merge branch 'master' of https://github.com/forfunza/battler

Conflicts:
	Assets/Photon Unity Networking/Demos/MarcoPolo-Tutorial/Substances_Free/Pavement_01.sbsar.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/49/492cc7eb84514c64da25775df488c9e6
	Library/metadata/4a/4ad7633f7befb9d4b81c2123c39c2dae
	Library/metadata/77/77f32f4466e3e7f4b90691d51e114969
	Library/metadata/7d/7d93183d7fa55d34fa5e60699b70656f
	Temp/AudioImport.audio
	Temp/UnityTempFile-015d5e7609ebf4942833c2ca9067414e
	Temp/UnityTempFile-09a5b5dca4e644150a308357d9a8bbdd
	Temp/UnityTempFile-1a8e85f2698514fef887a57c5c12e487
	Temp/UnityTempFile-28f1fc5af2fae460ca026305807490a2
	Temp/UnityTempFile-464096aaef0954b91b491fb15740db35
	Temp/UnityTempFile-4ade07314beac4dc19800fc78453222c
	Temp/UnityTempFile-5b85a9b3d51aa451da38d1cce59f7adc
	Temp/UnityTempFile-61d536765cb5f438bbe0a76b5ba40854
	Temp/UnityTempFile-b92005cc7bb004ad9b03b3bc23ad25e1
	Temp/UnityTempFile-cba4dc7bf265745aebfa4abcdc424962
	Temp/UnityTempFile-d615f4753d49b4534b56a4fb4b1ed5d5
	Temp/UnityTempFile-d7d645c9a362c42939d969ca418494ee
	Temp/UnityTempFile-e7427b67a17b94fbb9f8ab17e86fc9df