dummy sync

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

Conflicts:
	.DS_Store
	comstory/js/stats.js
Sync conflicted

recync except conflicted things