fix

Conflicts:
	irc.py