init
Resolved Conflicts in Readme