Merge remote-tracking branch 'origin/chris' into rulo
Para servidor
Merge remote-tracking branch 'origin/master' into rulo

Conflicts:
	.gitignore
	requirements.txt
Update requirements.txt
Merge remote-tracking branch 'github/master' into rulo
Merge branch 'master' of https://github.com/solorulo/provereference