Gerador de conflitos by carlos
Merge branch 'master' of https://github.com/1101008FredericoPavao/ExercicioPlGit

Conflicts:
	estudoeapli.txt