remove DS_Store
Merge branch 'master' of https://github.com/magento-hackathon/MageTrashApp
Merge branch 'master' of https://github.com/magento-hackathon/MageTrashApp