Initial commit
Resolved merge conflict on gitignore