Fixed conflict in README.me
Merge pull request #21 from gabrielsomoza/master

Fixed README Conflicts