changes that Cody helps with
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee