bana osv
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
minor
Merge remote-tracking branch 'origin/master' into Peter
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/Peter'
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Level2.png
	The Seekers Way 0.2/Level2Object.png