Tirate un paso
Merge branch 'master' of https://github.com/yaykuy/bitbrasil

Conflicts:
	routes/index.js