Nya texturer, Ny banstorlek
No-backing dayo
No-backing dayo #2
No-backing dayo #3
No-backing dayo #4
Merge remote-tracking branch 'origin/master' into Design

Conflicts:
	Assets/Scenes/test_robin.unity
	Assets/Scripts/TouchInput.cs
	Assets/Textures/GUIAtlasTest.png
Merge remote-tracking branch 'origin/master' into Design
For TESTING #2
Forced to commmit
Stuff from mastern(?)
Merge remote-tracking branch 'origin/master' into Design

Conflicts:
	Assets/Menu.meta
	Assets/Meshes/Maps/Materials/checker_medium.mat
	Assets/Scripts/GUI/GUIStick.cs
	Assets/Scripts/playerCollision.cs
	ProjectSettings/ProjectSettings.asset
stort p
Mindre bana
Sliderstyrning
Tiny map balance
30leaf
Merge remote-tracking branch 'origin/andreas' into Design
textur
Merge remote-tracking branch 'origin/andreas' into Design
Merge branch 'master' into Design

Conflicts:
	Assets/Prefabs/prefab_pile_of_leifs.prefab
	Assets/Scenes/test_johannes.unity
	Assets/Scenes/test_robin.unity
	Assets/Scripts/FootstepSound.cs.meta
	Assets/Scripts/PlayerCollision.cs.meta
	Assets/Scripts/Powerup/PowerupManager.cs
	Assets/Scripts/playerCollision.cs.meta