Initial commit
fixed merge conflict in Readme