modified .gitignore
merge with master