Unity stuff
Merge remote-tracking branch 'origin/master' into elias

Conflicts:
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/06/06e913341cd9683479ca9aac0634e41b
	Library/metadata/d9/d99c4e58ae2c22942b440eded47cb074
	Library/metadata/e3/e3c87d6613480de498c3591f4790e67d
Karaktären går baklänges
Unity stuff
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
merge alex unt elias work

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

Conflicts:
	Assembly-CSharp.pidb
	Assets/Objects/BigTrash.prefab
	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/3b/3bbd2d7238b2e404d99e24fc9582f253
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/57/57ca80d06ae882c428efcc6b876fbc4a
	Library/metadata/61/61c0390d6b5277e4f962a1e0e0dfa5ff
	Library/metadata/66/66bbaf47d67f89440b4a5cbfa0cd6ef8
	Library/metadata/90/901b098bca35a564f96615ca6bef8029
	Library/metadata/94/94e94a2c9b119d941a0f59730f0b3258
	Library/metadata/ab/ab18edbc627786f4ead4d614e7c1073c
	Library/metadata/b0/b0b13b0fa430d7a41b2dbb126aa0ab10
	Library/metadata/e3/e3c87d6613480de498c3591f4790e67d
	Trash-Mania.userprefs