Solved conflicts on README.md.
Merge pull request #143 from redboltz/solve_conflicts_on_readme

Solved conflicts on README.md.