Merge conflicts .-.
Merge branch 'master' of https://github.com/AGausmann/IRCBot