client changes
Complete master with ignore file
Merge branch 'master' of https://github.com/SlabtownJake/Primetime

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/nettest.unity
	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/guidmapper
	Library/metadata/61/617a059faf4a439488d3b7d42cd409da
	Library/metadata/a2/a2ffe8ba181580e44a931e909d3580e5