commit before merging in master.
Merge branch 'master' into calories
Update minutes and calorie widget on ajax request.
Merge pull request #38 from GeneChatham/calories

Calories!!!