begre
Merge remote-tracking branch 'origin/master'

Conflicts:
	8_semestre/pdi/trabalhoFinal/Thumbs.db