Updated README
Merged conflicts.