konflikt
Merge remote-tracking branch 'origin/Ameroz'

Conflicts:
	The Seekers Way 0.2/Main.cpp
Merge remote-tracking branch 'origin/Ameroz'
arrow v0.5
animation
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Sheeka.h
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
Merge remote-tracking branch 'origin/master' into Peter
include crap
?
sad
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Ameroz

Conflicts:
	The Seekers Way 0.2/Sheeka.cpp
	The Seekers Way 0.2/Sheeka.h