delete ds_Store
Merge branch 'master' of https://github.com/floz/component-app