test1

i keep getting sync error
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/NetworkManager.cs
	Cigam-csharp.sln
	Cigam.sln
	Cigam.userprefs
	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/metadata/85/854f4a43e227492438c7760de2f188a0