initial commit
resolved merge conflict in .gitignore