Adding master
editing Readme in master
merge conflicts
merging changes