sd
Merge branch 'master' of https://github.com/iddqt/Sharpshooter

Conflicts:
	SharpShooter/Assembly-CSharp.pidb
	SharpShooter/Assembly-UnityScript.pidb
	SharpShooter/Assets/GameManager/GameManager.cs
	SharpShooter/Assets/GameManager/GameState_Login.cs
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SharpShooter/Library/assetDatabase3
	SharpShooter/Library/metadata/f5/f52fb77b383326b44adb47167927e62c
	SharpShooter/SharpShooter.userprefs