more test commits by user 2
Merge branch 'master' of https://github.com/hurlbertlab/dietdatabase
creating a conflict with user2
manually resolving conflict 2