added gitignore
Merge branch 'master'