adding stuff
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
	bin/classes/com/cryingonion/runningcoach/SignUpActivity.class
	gen/com/cryingonion/runningcoach/R.java