modified:   src/no/hig/GlenGrongan/IrcClient/ConnectionSetup.java
User chat

Created user chat basics
Merge branch 'master' of https://github.com/Nagnorg/IrcClient

Conflicts:
	src/no/hig/GlenGrongan/IrcClient/ConnectOptions.java

	modified:   src/IrcClient.properties
	modified:   src/no/hig/GlenGrongan/IrcClient/ConnectOptions.java