derp
Merge branch 'master' into Lurz

Conflicts:
	Assets/_Scripts/PushAndPull.cs
Merge branch 'master' into Lurz
lite mer optimerad statemanager
Merge branch 'Jessica'
MENJAGHARREDANGJORTDETHÄR
Merge branch 'Lurz'

Conflicts:
	Assets/_Scenes/LurzScene.unity.meta
	Assets/_Scripts/PushAndPull.cs
Merge branch 'Patrik'