Refactored the whole calorie thing into a separate class, so i free´d some lines in main
Conflict resolving