Changes readme file
Merged conflicts