Fixed Waypoints
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge pull request #27 from sli-fox/marky_branch

Marky branch