Merge branch 'peter' into Vulkanmannen
Merge branch 'master' into Vulkanmannen
character jump
Merge branch 'Vulkanmannen' of https://github.com/Vulkanmannen/TheSeekersWayProject into Vulkanmannen
Merge branch 'vulkanmannen' into Ameroz
Merge branch 'master' into Vulkanmannen
jump
Merge branch 'ameroz'

Conflicts:
	The Seekers Way 0.2/Character.cpp
	The Seekers Way 0.2/Character.h
kiba
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Vulkanmannen
jump
Merge branch 'ameroz'
alex
jump acc
Merge branch 'ameroz'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Character.cpp
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
fix
jump