Initial commit
Fix merge conflicts with gitignore