I changed the readme and tested pushing
Apparent merging of the readme
Fixed readme conflicts