Added README.
Fixed merge conflicts.