kompis
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/Maps/Level5.png
fix
Merge branch 'master' into vulkanmannen
paralax animationer
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Maps/Level4.png
	The Seekers Way 0.2/Maps/Level5.png