a
a
darkbinding
prop
walljump magicswitch
Merge remote-tracking branch 'origin/Vulkanmannen'

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

Conflicts:
	The Seekers Way 0.2/Tottemaptest.png
Merge remote-tracking branch 'origin/Peter'

Conflicts:
	The Seekers Way 0.2/Entity.h
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
spiketrap
Nothing of worth
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Tottemaptest.png