Admin looking good
Fixed tables for diets and exercises
fixed the diet table and edit/new pages
Adjusted show
fixed diet test
merge
Diet hotfix
Admin hotfix
hotfix
kkkk
Merge branch 'clinton-final' of https://github.com/ikrogers/FLATS into clinton-final
kkkk
Final bug fixes