Lol Main

Lol
Merge branch 'master' of https://github.com/IlyaVorozhbit/Game

Conflicts:
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Materials/Player.mat
	Assets/test.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	Library/metadata/72/728a8e14917846248b4678c81de29344
	Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1

test