mmmh rymd porr!!!
Merge branch 'Lurz'

Conflicts:
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'master' of https://github.com/Patah93/NyRav
hejallabarn
Might break stuff!!!
Merge branch 'Lurz'

Conflicts:
	Assets/_Prefabs/HajPojken.controller
	ProjectSettings/EditorBuildSettings.asset
Pip pip. Jag är inte en näbbmus! Pip pip!
mjeh
Merge branch 'Jessica'
animationenförstörallt :)
Bla
Nöff nöff. Jag är inte en gris! Nöff nöff!
Merge branch 'Lurz'
fett mycke buggar borta mannen
Merge branch 'Patrik'

Conflicts:
	Assets/_Scripts/ThirdPersonCamera.cs
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/ProjectSettings.asset