nothing
Merge remote-tracking branch 'origin'

Conflicts:
	SharpShooter/Assembly-CSharp-Editor-firstpass.pidb
	SharpShooter/Assembly-CSharp-firstpass.pidb
	SharpShooter/Assembly-CSharp.pidb
	SharpShooter/Assembly-UnityScript-Editor-firstpass.pidb
	SharpShooter/Assembly-UnityScript-firstpass.pidb
	SharpShooter/Assembly-UnityScript.pidb
	SharpShooter/Assets/GameManager/GameState_Game.cs
	SharpShooter/Assets/Level/130424.unity
	SharpShooter/Assets/Level/Grave.unity
	SharpShooter/Assets/NetworkManager/PacketWriter.cs
	SharpShooter/Assets/Resources/Animated_archer/Materials/Standard_2.mat
	SharpShooter/Assets/Standard Assets/Water (Pro Only)/Sources/Objects/Materials/lambert1.mat
	SharpShooter/Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Objects/Materials/No Name.mat
	SharpShooter/Assets/inGame/Character.cs
	SharpShooter/Library/AssetServerCacheV3
	SharpShooter/Library/InspectorExpandedItems.asset
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SharpShooter/Library/ScriptMapper
	SharpShooter/Library/assetDatabase3
	SharpShooter/Library/expandedItems
	SharpShooter/Library/guidmapper
	SharpShooter/ProjectSettings/EditorBuildSettings.asset
	SharpShooter/SharpShooter.userprefs
	SharpshooterServer/Debug/SharpshooterServer.exe
	SharpshooterServer/Debug/SharpshooterServer.ilk
	SharpshooterServer/Debug/SharpshooterServer.pdb
	SharpshooterServer/SharpshooterServer.sdf
	SharpshooterServer/SharpshooterServer.suo
	SharpshooterServer/SharpshooterServer/Debug/CL.read.1.tlog
	SharpshooterServer/SharpshooterServer/Debug/CL.write.1.tlog
	SharpshooterServer/SharpshooterServer/Debug/Client.obj
	SharpshooterServer/SharpshooterServer/Debug/IOThread.obj
	SharpshooterServer/SharpshooterServer/Debug/ListenThread.obj
	SharpshooterServer/SharpshooterServer/Debug/Packet.obj
	SharpshooterServer/SharpshooterServer/Debug/Room.obj
	SharpshooterServer/SharpshooterServer/Debug/Server.obj
	SharpshooterServer/SharpshooterServer/Debug/Server_ClientManage.obj
	SharpshooterServer/SharpshooterServer/Debug/Server_GameUpdate.obj
	SharpshooterServer/SharpshooterServer/Debug/Server_IOThreadMethods.obj
	SharpshooterServer/SharpshooterServer/Debug/Server_ListeningThreadMethods.obj
	SharpshooterServer/SharpshooterServer/Debug/Server_PacketHandling.obj
	SharpshooterServer/SharpshooterServer/Debug/Server_UpdateThreadMethods.obj
	SharpshooterServer/SharpshooterServer/Debug/SharpshooterServer.log
	SharpshooterServer/SharpshooterServer/Debug/UpdateThread.obj
	SharpshooterServer/SharpshooterServer/Debug/cl.command.1.tlog
	SharpshooterServer/SharpshooterServer/Debug/link.command.1.tlog
	SharpshooterServer/SharpshooterServer/Debug/link.read.1.tlog
	SharpshooterServer/SharpshooterServer/Debug/link.write.1.tlog
	SharpshooterServer/SharpshooterServer/Debug/main.obj
	SharpshooterServer/SharpshooterServer/Debug/vc100.idb
	SharpshooterServer/SharpshooterServer/Debug/vc100.pdb
	SharpshooterServer/SharpshooterServer/PacketTypeList.h
	SharpshooterServer/SharpshooterServer/Server.h
	SharpshooterServer/SharpshooterServer/Server_PacketHandling.cpp
	SharpshooterServer/SharpshooterServer/SharpshooterServer.vcxproj.filters
	SharpshooterServer/ipch/sharpshooterserver-56bff849/sharpshooterserver-ceaea9c5.ipch