Unexpected DS_Store sync

Unexpected DS_Store sync
Merge branch 'master' of https://github.com/JayJayDee/teamsf-coms-shop

Conflicts:
	.DS_Store