Viktors commit
viktors commit
Merge remote-tracking branch 'origin/master' into Design

Conflicts:
	Assets/Scenes/test_robin.unity
	Assets/Scripts/scr_cameraFollow.cs
Testning Variabler/Kamera
Testning of DOOM (Variabler/Kamera HOTFIX)
Merge remote-tracking branch 'origin/master' into andreas
commit fix