still trying to get fucking heroku to work
Merge branch 'master' of https://github.com/rebeccawalsh/diaryapp