Initial commit
Fixed conflict in gitignore