added blacklist
Merge branch 'master' of github.com:timmil/jokeBot