README.md
Solve merge
Merge remote-tracking branch 'original/master'

Conflicts:
	README.md
Merge pull request #1 from elderdosantos/master

README.md