go command
Merge branch 'master' of github.com:hikirsch/nodecopter-32-jsconf-2013

Conflicts:
	server/cntrl.js
Merge branch 'master' of github.com:hikirsch/nodecopter-32-jsconf-2013