ummm, not sure what I changed...
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot

Conflicts:
	ircParser.erl