no message
Merge branch 'master' of https://github.com/Ashua/projectbnc_test

Conflicts:
	New Unity Project 1/New Unity Project 1-csharp.sln
	New Unity Project 1/New Unity Project 1.sln
no message
Merge branch 'master' of https://github.com/Ashua/projectbnc_test

Conflicts:
	New Unity Project 1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	New Unity Project 1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	New Unity Project 1/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project 1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project 1/Library/assetDatabase3
	New Unity Project 1/Library/guidmapper
	New Unity Project 1/Library/metadata/0b/0b77d61d173164fb8b6cc067c9845a47
	New Unity Project 1/Library/metadata/56/569c4fb07db37d1458ad9ac55d9237e6
	New Unity Project 1/Library/metadata/87/878898e23d075764799b4391f7de0cdf
	New Unity Project 1/Library/metadata/a5/a5953cbd82f44c644b2e4c26b633c71c
	New Unity Project 1/Library/metadata/cb/cb24cee6cfa29e94388a01a97a006454
	New Unity Project 1/Library/metadata/d2/d2fb6a3988dc1c84eb629148095cabdb
	New Unity Project 1/New Unity Project 1-csharp.sln
	New Unity Project 1/New Unity Project 1.sln
	New Unity Project 1/Temp/UnityTempFile-2f21f4e910e8a48048de57d22962d52f
	New Unity Project 1/Temp/UnityTempFile-c1a0af39dee19485fbf50e71c73f95dc
	New Unity Project 1/Temp/UnityTempFile-da73e2f45ce4b4bccbd809244cbcc633
	New Unity Project 1/Temp/UnityTempFile-f0b00d175dfd548e9889a06381f57f1c
	New Unity Project 1/Temp/__BuildPlayer Backupscene
	New Unity Project 1/Temp/__EditModeScene
no message