risky commit tested OK
Merge branch 'master' of github.com:smartly23/CaloryCounter

proste merge