updating server
Merge branch 'master' of https://github.com/walkandre/node-livereload-dev-server

Conflicts:
	server.js