Progress Bar
R.java
FragmentHeartRate
layoutHeartRate
merge
Merge branch 'master' of https://github.com/wiznuq/RunningCoach.git

Conflicts:
	bin/RunningCoach.apk
	bin/classes.dex
	bin/classes/com/cryingonion/runningcoach/HeartRateFragment.class
	bin/classes/com/cryingonion/runningcoach/LetsRunFragment.class
	bin/classes/com/cryingonion/runningcoach/LoginActivity$1.class
	bin/classes/com/cryingonion/runningcoach/LoginActivity$2.class
	bin/classes/com/cryingonion/runningcoach/LoginActivity.class
	bin/classes/com/cryingonion/runningcoach/MainActivity$1.class
	bin/classes/com/cryingonion/runningcoach/MainActivity$SlideMenuClickListener.class
	bin/classes/com/cryingonion/runningcoach/MainActivity.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoach.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment$1$1.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment$1$2.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
	bin/classes/com/cryingonion/runningcoach/SignUpActivity$1.class
	bin/classes/com/cryingonion/runningcoach/SignUpActivity.class
	bin/classes/com/cryingonion/runningcoach/adapter/NavDrawerListAdapter.class
	bin/resources.ap_
	gen/com/cryingonion/runningcoach/R.java
	src/com/cryingonion/runningcoach/HeartRateFragment.java
	src/com/cryingonion/runningcoach/MainActivity.java