Moar channel-action
Merge branch 'master' of https://github.com/leonarven/ircmud

Conflicts:
	src/ircmud/Ircmud.java