dont know this junk crapp is
Merge remote-tracking branch 'origin/master'

Conflicts:
	BattleGrounds/Library/ScriptAssemblies/Assembly-CSharp.dll
	BattleGrounds/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	BattleGrounds/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll

	BattleGrounds/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb

	BattleGrounds/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	BattleGrounds/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	BattleGrounds/Library/ScriptAssemblies/Assembly-UnityScript.dll
	BattleGrounds/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	BattleGrounds/Library/ScriptMapper
	BattleGrounds/Library/metadata/32/32fa447008cdfef42a0f0c9b807122ac
	BattleGrounds/Library/metadata/7a/7a51ee84628460446bfc2358f6f41067
	BattleGrounds/Library/metadata/af/af8d3c4e1daaa964d8ebe97c306153b3
	BattleGrounds/Library/metadata/e5/e575d87b54952ae4481f7d85d35b4dbf
	BattleGrounds/Library/shadercompiler-1.log