Edited README
Trying to cause conflict
Hopefully resolved conflict