fixing conflicts
Merge branch 'master' of github.com:danny2000tw/Calorie-tracker