Lite pill...
Merge branch 'master' into Patrik (FIXAT KAOSET KANSKE....)

Conflicts:
	Assets/MovingMan.cs