added ReadME file
fixed readme
fixed readme
fixed the conflicts