Initial commit
Fix .gitignore conflict