First commit
Fixing .gitignore conflicts