Mac Crap Added to gitignore
Merge branch 'master' of https://github.com/romibi/HSR_ParProg

Conflicts:
	.gitignore