ignore DS_Store files
Merge branch 'develop' of github.com:sotacoa/website into develop

Conflicts:
	.gitignore