Updated readme
Fixed conflict with ross