Ignore DS Store. ug.
Merge branch 'master' of https://github.com/mobytim/base_assets-rails