Initial commit.
Updated README. Fixed merge conflict.