balance
Merge branch 'master' of https://github.com/eliasfurenhed/Trash-Mania

Conflicts:
	Assembly-CSharp.pidb
	Assets/Objects/Trash.prefab
	Assets/Scenes/MainGame.unity
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/90/901b098bca35a564f96615ca6bef8029
	Library/metadata/b0/b0b13b0fa430d7a41b2dbb126aa0ab10
	Library/metadata/c9/c99f0e5fa65665646a340d15324a9437
	Library/metadata/da/daa932788b4e07f4296f36ca7a1cf8df
	Trash-Mania.userprefs