fix
Merge branch 'master' of https://github.com/Thor77/PythonIrcBot

Conflicts:
	irc.py