corrigindo dados errados do commit anterior
Merge branch 'master' of https://github.com/gsouzab/trab3cg

Conflicts:
	mainwindow.h