testi
Merge branch 'master' of https://github.com/elgis/IRC-Bot

Conflicts:
	IRCBot/Bot.cs
testi
testi
Merge branch 'popena-master'