1
тесткоммит
	modified:   Unityproject/Assets/Scenes/lvl1.unity
	modified:   Unityproject/Assets/scripts/LeftTouchPad.prefab
	modified:   Unityproject/Assets/scripts/RightTouchPad.prefab
	modified:   Unityproject/Library/CurrentLayout.dwlt
	modified:   Unityproject/Library/CurrentMaximizeLayout.dwlt
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
	modified:   Unityproject/Library/CurrentLayout.dwlt
	modified:   Unityproject/Library/CurrentMaximizeLayout.dwlt
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Library/guidmapper
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
тетс
Merge remote-tracking branch 'origin/Nerzull' into test

Conflicts:
	Unityproject/Assets/Scenes/lvl1.unity
	Unityproject/Library/CurrentLayout.dwlt
	Unityproject/Library/CurrentMaximizeLayout.dwlt
	Unityproject/Library/InspectorExpandedItems.asset
	Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unityproject/Library/assetDatabase3
	Unityproject/Library/expandedItems

	modified:   Unityproject/Assets/scripts/LeftTouchPad.prefab
	modified:   Unityproject/Assets/scripts/RightTouchPad.prefab
	modified:   Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	modified:   Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Library/expandedItems
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
	new file:   Unityproject/test.txt