Mod
Merge branch 'master' of https://github.com/SpringMT/irc_bot

Conflicts:
	irc_bot.rb