Merge branch 'master' of C:\xampp\htdocs\project_tcc with conflicts.
Merge remote-tracking branch 'origin/master'
criado modelo   tela de comparação e preço
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml