Readme updated
Resolve conflicts with master and update readme