changed readme
changed readme
changed readme, conflict fixed