gotta commit so I can pull
Merge branch 'master' of https://github.com/chris-paterson/study-buddy