Finalização
Merge branch 'master' of https://github.com/memorais/tc2_olap

Conflicts:
	tcc-cap7.tex
	tcc-cap8.tex