updated .gitignore
Merge branch 'master' into typos

Conflicts:
	.gitignore