Merge pull request #41 from sli-fox/steph_branch

Steph branch
Merge pull request #42 from sli-fox/steph_branch

Fixing Mark's mistake with Blacky
Added Next Wave button
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge pull request #43 from sli-fox/marky_branch

Marky branch
Working on threads
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch
Next wave button implemented