Readme and initial package.json
merge conflict fix