Changed Resource Button back
calorie+date
Merge branch 'master' of https://github.com/wraziens/INFO6130