Bonnie's temp
Merge branch 'master' of https://github.com/BonnieBBS/Calorie_Manager
Merge branch 'master' of https://github.com/BonnieBBS/Calorie_Manager
user's haveTakenCal first implemented
Merge branch 'master' of https://github.com/BonnieBBS/Calorie_Manager