Updated README
Merged README and resolved conflicts