conflikt
hjr
audio class bla
Merge branch 'Ameroz'

Conflicts:
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
Merge branch 'master' into vulkanmannen
Merge branch 'master' into vulkanmannen
ani mm
levelskit
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
finishdoor
charlotte
Merge branch 'vulkanmannen'
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp