Thread code -- not activated
Killed Blacky, added Start Wave functionality
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch
Merge pull request #50 from sli-fox/steph_branch

Steph branch