ds_store
Merge branch 'master' of https://github.com/filipesf/herokuready