Not sure of the changes here. Been a while since I've worked on it
Merge pull request #1 from barhamd/user-calories

Not sure of the changes here. Been a while since I've worked on it