basic bot
Merge branch 'master' of github.com:nthitz/mashupcmbot

Please enter a commit message to explain why this merge is necessary,