updated readme, testing ammend
updated readme
resolved conflict in readme