First Commit
Fixing .gitignore conflict.