Consertamos o problema do github
Merge branch 'master' of https://github.com/pavalucas/projeto-SACI

Conflicts:
	historia.txt
lixo
Merge branch 'ok'
Merge branch 'master' into ok