added .gitignore
project added
resolved merge conflict