yongsub room state changed
Merge remote-tracking branch 'origin'

Conflicts:
	SharpShooter/Assembly-CSharp.pidb
	SharpShooter/Assembly-UnityScript.pidb
	SharpShooter/Assets/NetworkManager/NetworkManager.cs
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SharpShooter/Library/assetDatabase3
	SharpShooter/Library/metadata/00/00bd446708be3614895e4f1a8a18c2ac
	SharpShooter/Library/metadata/13/13adc36f90f1a2543aa832d160386d5f
	SharpShooter/Library/metadata/88/883119b775cbe5244b21df3a3f43dc17
	SharpShooter/Library/metadata/c7/c7de9ffafa529f04b9890cdd04069b0f
	SharpShooter/SharpShooter.userprefs