a
correção do merge
Solve merge
Merge remote-tracking branch 'original/master'

Conflicts:
	README.md