git ignore .DS_Store
Merge branch 'master' of heroku.com:bobgilmore-blog