old code
solved
Merge branch 'master' of github.com:h43z/liveshell-server

Conflicts:
	server.js