Git Ignore: more random Intellij files to ignore
Merge branch 'master' of https://github.com/CHASS-College-Computing/ScotGrid

Conflicts:
	.gitignore