Added a README
Renamed the package files
Fixed merge conflict
Merge branch 'develop'