better description of the repository
Merge pull request #2 from lpeterman/conflict-on-readme

better description of the repository