.
Merge branch 'master' of https://github.com/lalkmim/varredor

Conflicts:
	server/server.js
Merge branch 'master' of https://github.com/lalkmim/varredor
Merge branch 'master' of https://github.com/lalkmim/varredor