UPDATE ignorefile
Merge branch 'p4estIntegration' of github.com:plattenschieber/particleChase into p4estIntegration

Conflicts:
	.gitignore