rm .DS_Store and setting
Merge branch 'master' of https://github.com/xiaowuqi/MakerBund