Lauren's changes during class
Merge branch 'master' of https://github.com/wlftn/bongo-sample-app