when running server.js you can specify the server as a first parameter
Merge branch 'master' of github.com:tartavull/proyecto