vet inte ens... min scen typ
Merge branch 'Patrik' of https://github.com/Patah93/NyRav into Patrik

Conflicts:
	Assets/_Scenes/PatrikScene.unity
Räv
Merge branch 'Patrik'

Conflicts:
	Assets/_Scripts/ThirdPersonCamera.cs
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/ProjectSettings.asset
asfs
Merge branch 'master' of https://github.com/Patah93/NyRav

Conflicts:
	Assets/_Scenes/PimsScene.unity
	Assets/_Scripts/ParticleSwitch.cs
Input-saker
Merge branch 'master' of https://github.com/Patah93/NyRav
input
Merge branch 'Jessica'
Rav intelligens my6cket smart ja
Merge branch 'master' of https://github.com/Patah93/NyRav
Meh
Merge branch 'master' of https://github.com/Patah93/NyRav

Conflicts:
	Assets/_Scripts/ParticleSwitch.cs
Mjau mjau. Jag är inte en katt! Mjau mjau!
Herpa derp
Merge branch 'Lurz'

Conflicts:
	Assets/_Prefabs/HajPojken.controller
	Assets/_Scenes/LurzScene.unity
	Assets/_Scenes/StartScene.unity
	Assets/_Scripts/AnimationMan.cs
	Assets/_Scripts/ThirdPersonCamera.cs
	Assets/_Scripts/Throw.cs
	Assets/animations/a12tobkr_A_Boy@Land_02.fbx.meta
	Assets/animations/a12tobkr_A_Boy@jump_03.fbx.meta
FOX INTELLIGENCE, SO CLEVER, SO SMART, LIKE NOTHING YOU HAVE EVER SEEN! AMAZED WILL THOU BE
Merge branch 'master' of https://github.com/Patah93/NyRav
Super geil, super geil! Jag är inte en tysk! Super geil, super geil!