fixed Tango, fixed a Boop
Merge branch 'master' of https://github.com/MatthewCox/PyMoronBot