Initial Commit.
Removed merge conflict in .gitignore.