Updating readme
Fixing master conflicts