Updating .gitignore
Merge branch 'master' of https://github.com/Hammers/ParallelProcessor

Conflicts:
	.gitignore