a
a
prop
asf
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