Edited Readme
working with merge conflicts