Merge remote-tracking branch 'origin/master' into peter
Kiba Sprite
asd
öp
Merge branch 'Ameroz'

Conflicts:
	The Seekers Way 0.2/Level.txt
fix
fix
Merge remote-tracking branch 'origin/peter'
Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/Level.txt
Merge remote-tracking branch 'origin/peter'
asd
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
<zx
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/VideoState.cpp
	The Seekers Way 0.2/VideoState.h