Bibitex
Merge branch 'master' of github.com:roboime/ip-jan-bramigk

Conflicts:
	relatorio/relatorio.tex
Committing...
Merge branch 'master' of github.com:roboime/ip-jan-bramigk

Conflicts:
	relatorio/relatorio.tex