rm *.DS_Store
Merge branch 'master' of https://github.com/piotch/production