teste de conflito
Merge branch 'master' of https://github.com/matchs/nodejs-nocando

Conflicts:
	foo