introduced a bug that caused revolts
fixed something i thought I already fixed
Merge branch 'master' of github.com:AlwaysTraining/bbot
Merge branch 'master' into feature