Merge remote-tracking branch 'origin/Ameroz'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Sheeka.cpp
	The Seekers Way 0.2/Sheeka.h
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Sheeka.cpp
Merge remote-tracking branch 'origin/Ameroz'
git
Merge remote-tracking branch 'origin/master' into Vulkanmannen

Conflicts:
	The Seekers Way 0.2/Sheeka.cpp
sheeka anim
dfal
Merge remote-tracking branch 'origin/master' into Vulkanmannen
Merge remote-tracking branch 'origin/Ameroz'
jump animation och uppdatering
Merge remote-tracking branch 'origin/Vulkanmannen'
tisdag peters arbete
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
alexs fix
Merge remote-tracking branch 'origin/Ameroz'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Charlotte.cpp
Sheekadash removal