First commit
Resolve .gitignore conflict