first commit
hai
hai
hai
Merge branch 'master' of ssh://tatooine.evilzone.org:31337/factionwars/evilircbot

Conflicts:
	irc.cpp
	irc.h
	main
	main.cpp
	main.h
fags
parser
 Please enter the commit message for your changes. Lines starting
Arguments
Merge branch 'master' of https://github.com/Factionwars/evil-irc-bot