Changed gitignore
Removed temp files
Merge branch 'master' of https://github.com/SalamiCo/ISBC-P2

Conflicts:
	tempFiles/groupA.dsc
	tempFiles/groupB.dsc