First commit.
Fixed readme conflicts.