final changes
Merge branch 'master' of https://github.com/sli-fox/jamms into jeremy
Merge pull request #74 from sli-fox/jeremy

Jeremy