Keyboard event Num0 to clearAllTowers()
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge pull request #39 from sli-fox/steph_branch

Toggle waypoints implemented
Added showBlacky boolean and moved controlCat() to Critter.cpp
Fixed conflicts
Merge pull request #40 from sli-fox/marky_branch

Marky branch
Remove points and lives from playa
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch