Initial commit.
Fixed .gitignore merge conflict.