final
test
Merge branch 'master' of https://github.com/ice0lfe/artigos-IPC into origin-
q nd 2
Conflicts:
	sbc-template.log
	sbc-template.pdf
Merge branch 'origin-'
q nd 3
Conflicts:
	sbc-tempkklate.bib
	sbc-template.log