Initial commit
Fixed merge conflict with .gitignore