Updated README
Sorted merge conflicts