modified .gitignore
Merge origin/master
modified files