Initial commit
Fix gitignore merge conflict