New readme file.
Changed readme file.
Amended merge conflict