Initial commit
Fixed .gitignore collision