added gitignore

this time for the master
fixed merge conflict