Merge branch 'master' of heroku.com:eightglasses

i'm not sure what this merge is doing
git ignore