changed gitignore
Merge branch 'master' of https://github.com/TestSubject528491/chharvey

Conflicts:
	.gitignore