delete DS_Store
Merge branch 'master' of https://github.com/gogotanaka/umart_on_rails