Initial commit
Resolved merge conflicts in .gitignore