Triggers
Merge branch 'master' of https://github.com/Patah93/NyRav

Conflicts:
	Assets/_Scripts/JumpingMan.cs
Merge branch 'Patrik'

Conflicts:
	Assets/Trigger.cs
	Assets/_Scripts/JumpingMan.cs
	Assets/scen1-2.unity
HEJDÅBUGG
Merge branch 'Jessica'
Merge branch 'master' of https://github.com/Patah93/NyRav
ALPHA
Merge branch 'Patrik'

Conflicts:
	Assets/scen1-2.unity