Merge branch 'peter' into Vulkanmannen
Merge branch 'master' into Vulkanmannen
Door

skapade en relativ tom dörr klass
character jump
Merge branch 'Vulkanmannen' of https://github.com/Vulkanmannen/TheSeekersWayProject into Vulkanmannen
Merge branch 'vulkanmannen' into Ameroz
jump
Merge branch 'ameroz'

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