First commit.
Fix merge conflict caused by github-generated README.