previously uncommitted changes by Miguel
Merge branch 'master' of https://github.com/hurlbertlab/dietdatabase
adding test commit by user 2
manually resolved conflict to keep changes from both users