Fixing git problems
Merge branch 'master' of https://github.com/Hazematman/gijam
Merge branch 'master' of https://github.com/Hazematman/gijam
Merge branch 'master' of https://github.com/Hazematman/gijam
Jumping finished-ish