balance
Bla
comMerge remote-tracking branch 'origin/master' into Vulk

Conflicts:
	Assets/Resources/Objects/Trash/IceCream.prefab
	Assets/Resources/Objects/Trash/SpeedTrash.prefab
	Assets/Resources/Objects/Trash/StartTrashCatchFive.prefab
	Assets/Resources/Objects/Trash/StartTrashInLove.prefab
	Assets/Resources/Objects/Trash/StartTrashRain.prefab
	Assets/Resources/Objects/Trash/TruckTrash.prefab
	Assets/Resources/Scenes/Level2.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/06/06e913341cd9683479ca9aac0634e41b
	Library/metadata/16/1670af28a843cde488f9bf3b37dac4e6
	Library/metadata/37/373738b02dc0d044d8de6d0c5039a2d7
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/50/50e3b83fb0db77142833aa4f25792ef0
	Library/metadata/60/6097b7b77a5f2e74ab4f97996e09fdc5
	Library/metadata/ab/ab56dabcada17a946b3762d2b0ca04e3
	Library/metadata/ac/acbe615ff5d47fb47afe8b1564e94be2
	Library/metadata/b0/b07930c0ecd72af458f2093993ca6122
	Library/metadata/b7/b7a2e241dc00ecb4894ddc7bebd01af5
	Library/metadata/c3/c38690bdb9800d346a5f4ee21a1cfd76
	Library/metadata/d4/d4e034ca5c1bc9c4ebcb48b3fb02ddf3
	Library/metadata/f9/f99f10e1fcc9c9f41bcbcf3618914e93
	Temp/UnityTempFile-1c656086cf74b96429fca823d4b9ec29
	Temp/UnityTempFile-2b2bc1450a275624fb6b81d484d275bc
	Temp/UnityTempFile-cd74bfa3cb5611d419872a623559486f
	Temp/__EditModeScene
fix
Merge remote-tracking branch 'origin/master' into Vulk

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/16/1670af28a843cde488f9bf3b37dac4e6
	Library/metadata/64/645206e0e7e5fff43be5efbe7c84a79a
	Library/metadata/ab/ab56dabcada17a946b3762d2b0ca04e3
	Library/metadata/ac/acbe615ff5d47fb47afe8b1564e94be2
	Library/metadata/c3/c38690bdb9800d346a5f4ee21a1cfd76
	Library/metadata/f1/f1b0e437303b425438d9252ce69772de
	Library/metadata/fd/fdce001f9ddeefd4ab5fa33b3e88a4e0
	Trashmania.userprefs
fix
Menu
Map
shop