Modified README
Resolved conflict on README
Changed readme