Skuggdetektering, 2.0
Merge branch 'master' into Patrik

Conflicts:
	Assets/MovingMan.cs
	Assets/_Level.meta
	Assets/_Scripts.meta
dd
Merge branch 'master' of https://github.com/leejesslee/SpelProjekt2Rav

Conflicts:
	Assets/MovingMan.cs
Lite pill...
lite ph animationer och ny kamera v.1
Merge branch 'master' into Patrik (FIXAT KAOSET KANSKE....)

Conflicts:
	Assets/MovingMan.cs
Hoppas det funkar nu lol
Merge branch 'Patrik'
MovingMan is best
Merge branch 'master' of https://github.com/leejesslee/SpelProjekt2Rav

Conflicts:
	Assets/MovingMan.cs
	Assets/_Level.meta
	Assets/_Scripts.meta
Blerp
menle
Merge branch 'Pims'
Merge branch 'master' into Jessica