Updated README
Merged conflicts in README