basic auth
Merge branch 'master' of https://github.com/Stuk4/demo_rest

Conflicts:
	package.json
	server.js
fixenado