Updated readme; fixing conflicts
updated readme.md