Initial commit
Fixed conflicts in .gitignore