Ignore .DS_Store

Ignore .DS_Store Mac files
Merge branch 'master' of https://github.com/deib-polimi/SPF

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/deib-polimi/SPF