remove .DS_Store
now we support 'make clean'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	.gitignore