idk
fixed conflict
idk
Merge branch 'master' of github.com:danny2000tw/Calorie-tracker
fixed conflicts
Merge branch 'master' of github.com:danny2000tw/Calorie-tracker
shit
Merge branch 'master' of github.com:danny2000tw/Calorie-tracker
fixed edge cases and DB setup