Merge pull request #55 from sli-fox/marky_branch

Removed .localhistory
Waypoints fix for Sinnig map
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