Merge branch 'master' of
https://github.com/Shakenbeer/SimpleNutritionCalculator.git
Merge branch 'master' of
https://github.com/Shakenbeer/SimpleNutritionCalculator.git