Please work, github for windows
Merge remote-tracking branch 'origin/auvray'

Conflicts:
	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/guidmapper
	Library/metadata/19/1980c449c627e4b2ab0ef33219dac3f9
	Library/metadata/8c/8c548b1b739b4469e804a437488e82ff
	SyberPlunk-csharp.sln
	SyberPlunk.sln