added gitignore
Merge origin/master