Initial code commit.
Merge conflicts in README.md