Changing Array Value
Changing layout Fragment LetsRun
Adding Calories per minute burned
Merge branch 'master' of git@github.com:wiznuq/RunningCoach.git

Conflicts:
	bin/classes/com/cryingonion/runningcoach/LetsRunFragment.class
	bin/classes/com/cryingonion/runningcoach/LoginActivity.class
	bin/classes/com/cryingonion/runningcoach/MainActivity.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment$1.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment$2.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment.class
	bin/classes/com/cryingonion/runningcoach/R$id.class
	bin/classes/com/cryingonion/runningcoach/R$layout.class
	bin/classes/com/cryingonion/runningcoach/R$menu.class
	bin/classes/com/cryingonion/runningcoach/R$string.class
	bin/classes/com/cryingonion/runningcoach/R$style.class
	bin/classes/com/cryingonion/runningcoach/R$xml.class
	gen/com/cryingonion/runningcoach/R.java
	res/values/strings.xml
adding resources
error missing R file
asdgasg
Merge branch 'master' of git@github.com:wiznuq/RunningCoach.git

Conflicts:
	bin/RunningCoach.apk
	bin/classes.dex
	bin/classes/com/cryingonion/runningcoach/LoginActivity$1.class
	bin/classes/com/cryingonion/runningcoach/LoginActivity.class
	bin/classes/com/cryingonion/runningcoach/MainActivity.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment.class
	bin/classes/com/cryingonion/runningcoach/R$drawable.class
	bin/classes/com/cryingonion/runningcoach/R$id.class
	bin/classes/com/cryingonion/runningcoach/R$layout.class
	bin/classes/com/cryingonion/runningcoach/R$menu.class
	bin/classes/com/cryingonion/runningcoach/R$string.class
	bin/classes/com/cryingonion/runningcoach/R$style.class
	bin/classes/com/cryingonion/runningcoach/R$xml.class
	bin/classes/com/cryingonion/runningcoach/SignUpActivity$1.class
	bin/resources.ap_
	gen/com/cryingonion/runningcoach/R.java
	project.properties