key in config file
Merge branch 'master' of https://github.com/joelfire/irc-secure into props-file

Conflicts:
	src/main/java/org/joelfire/ircsecure/IRCSecure.java
Merge pull request #3 from joelfire/props-file

key in config file