update .gitignore
Merge master into sandbox
typo