unsure
Merge branch 'master' of https://github.com/msutyak/crowdsets

Conflicts:
	.DS_Store