Initial Commit
Initial commit.
Fixed .gitignore conflict.