Update .gitignore
Merge branch 'master' into classwork

Conflicts:
	.gitignore