Editing readme
LALA
Fixing merge