change .gitignore to ignore all .DS_Store files, not just the ones in the top directory
Merge branch 'master' of github.com:pillravi/journey-journal