Merge branch 'master' of github.com:aaronpk/zenircbot-meme
nobody expects another meme!
Merge pull request #6 from JerrySievert/master

nobody expects ...