God knows what I was thinking
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot into ircParser

Conflicts:
	ircParser.erl
Improved prime to give better feedback
Also made telnet not crash by making it do nothing
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot
Merge pull request #4 from egelmex/master

Most of a new parser
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot into ircParser

Conflicts:
	ircParser.erl
Merge merge merge
Plugged @egelmex's parser in
- Moved tests to bottom of file in ircParser.erl
- Changed the pattern matching on parse()
- Modified other files to match new paterns
Merge pull request #6 from graymalkin/master

Mex's changes to the ircParser
Fixed a problem with new line characters looming on the end of trails
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot
Made small changed to these files
-Changed irc parser to not match #telnet to the time module
-not sure what I changed in the prime module XD
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot
Notion of admin has been added
ToDo:
- Admin management, perhaps this can be done with records?
Fixed a bug on self killing
Merging
Merge branch 'master' of https://github.com/Tatskaari/EarlTheIRCbot

Conflicts:
	ircParser.erl
Update README.md
Added rudimentarry poking at servers
Currently only works for tatskaari and there is not way to respond but it's a start.