initial commit
Resolve conflicts in .gitignore