Merge branch 'paddatrapper-navigation'
Merge branch 'deathBug' of https://github.com/paddatrapper/JAdventure into paddatrapper-deathBug
Merge branch 'paddatrapper-deathBug'
Merge remote-tracking branch 'upstream/master' into fixes