Quick small changes
Merge branch 'master' of https://github.com/yaykuy/bitbrasil

Conflicts:
	data.txt
	routes/index.js