testing readme
Edited readme, resolved conflict