fixed the nick update bug...
Merge branch 'master' of github.com:askabt/scrollback

Conflicts:
	client/client.js
	client/client.min.js