updated gitignore
merge from master