fh
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
some sheeka
switch
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Main.cpp
konflikt
konflikt
deleted map2
Merge remote-tracking branch 'origin/Ameroz'

Conflicts:
	The Seekers Way 0.2/Main.cpp
map2 delete
comment
comment
dll delete
Merge remote-tracking branch 'origin/Ameroz'
Merge remote-tracking branch 'origin/master' into Peter

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