added gitignore
resolved merge conflict