Initial commit
Resolve conflict in gitignore