day 2 jennifer
Merge branch 'master' of https://github.com/daily-bruin/gryphondor