fixed a database bug and the ridiculous orange juice bug. Fuck!
Merge branch 'master' of github.com:speendo/genBot2