added .gitignore
merging from master