updated readme
fixed link in readme
resolved readme conflicts