first commit
Merge branch 'master' of https://github.com/agentOfChaos/4Ubot