.DS_Store banished!
Merge branch 'master' of https://github.com/xiaobagou/dataExchange

Conflicts:
	.gitignore