changed the README
changed README to make a conflict with the testing branch
resolved README conflict
resolved README conflict