nova 2
Merge branch 'master' of https://github.com/thomasdelgado/testeBEPID

Conflicts:
	untitled text 2 copy.txt