DS_Store
.DS_Store
 Merge branch 'master' of heroku.com:stylistic
merge
Merge branch 'master' of heroku.com:stylistic