remove
dialog
Someshit
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Dll move
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/The Seekers Way.exe
bös
Bös2
bös3
Merge branch 'Ameroz' of https://github.com/Vulkanmannen/TheSeekersWayProject into Ameroz

Conflicts:
	The Seekers Way 0.2/Main.cpp
bös4
notvärde
Merge branch 'Ameroz' of https://github.com/Vulkanmannen/TheSeekersWayProject into Ameroz

Conflicts:
	The Seekers Way 0.2/StartMenu.cpp
alpacas
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.exe
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
	The Seekers Way 0.2/Tottemaptest.png
fix
conflict
något
Merge remote-tracking branch 'origin/master' into Peter

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

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/EntityManager.h
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters