Initial commit
Fixed .gitignore conflict