Add DS_Store to gitignore
Merge branch 'rails' of https://github.com/kilmc/leaflr into rails