trialrunnewchanges
Merge branch 'master' of https://github.com/bpalchesko/DoggyDetector

Conflicts:
	bin/classes.dex
	bin/classes/edu/upenn/cis350/cancerDog/EditDefaultActivityNew.class
	bin/classes/edu/upenn/cis350/cancerDog/R$id.class
	bin/classes/edu/upenn/cis350/cancerDog/R$layout.class
	bin/classes/edu/upenn/cis350/cancerDog/R$menu.class
	bin/classes/edu/upenn/cis350/cancerDog/R$string.class
	bin/classes/edu/upenn/cis350/cancerDog/R$style.class
	bin/classes/edu/upenn/cis350/cancerDog/RandomizeActivity.class
	bin/classes/edu/upenn/cis350/cancerDog/SaveNotification.class
	bin/classes/edu/upenn/cis350/cancerDog/TrialActivity.class
	bin/classes/edu/upenn/cis350/cancerDog/TrialData.class
	bin/classes/edu/upenn/cis350/cancerDog/TrialRunActivity$PostJson.class
	bin/classes/edu/upenn/cis350/cancerDog/TrialRunActivity.class
	bin/classes/edu/upenn/cis350/cancerDog/WheelActivity.class
	bin/classes/edu/upenn/cis350/cancerDog/confirmSettings.class
	bin/classes/edu/upenn/cis350/cancerDog/tests/RandomizeActivityTest.class
	bin/classes/edu/upenn/cis350/cancerDog/tests/TrialActivityTest.class
	bin/classes/edu/upenn/cis350/cancerDog/tests/WheelActivityTest.class
	bin/resources.ap_
	gen/edu/upenn/cis350/cancerDog/R.java