socket new text update
Merge branch 'master' of https://github.com/ligool/Kanvas

Conflicts:
	bin/www