Revamp
Merge branch 'master' of https://github.com/Spydar007/IRCBot

Conflicts:
	bot.php