Merge pull request #54 from sli-fox/steph_branch

Steph branch
Removed .localhistory
Merge pull request #55 from sli-fox/marky_branch

Removed .localhistory
Merge pull request #56 from sli-fox/steph_branch

Waypoints fix for Sinnig map
Changed sprites
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge pull request #57 from sli-fox/marky_branch

Marky branch
Minor tweaks