hmmm
Merge branch 'development' of github.com:XoderZ/phoenix-irc-bot into development

Conflicts:
	bot.php