Fixing Calories
Merge branch 'master' of git@github.com:wiznuq/RunningCoach.git

Conflicts:
	bin/classes/com/cryingonion/runningcoach/LetsRunFragment.class
	src/com/cryingonion/runningcoach/LetsRunFragment.java