modified:   src/main/scala/sampleclean/.DS_Store
	modified:   src/main/scala/sampleclean/clean/.DS_Store
Merge branch 'master' of https://github.com/sjyk/sampleclean-async

Conflicts:
	src/main/scala/sampleclean/SCDriver.scala