updating names
updating readme
Fixed README conflict