fuckidk
Merge branch 'master' of https://github.com/rebeccawalsh/diaryapp
reorganized a shit load of stuff