basic readme
merge conflicts
added to Readme