Delete EditDefaultActivity.java
Delete RandomizeActivity.java
Delete SlotRecorder.java
Delete Trial.java
Delete TrialActivity.java
Delete TrialData.java
deleted unused xml files
Merge branch 'master' of github.com:bpalchesko/DoggyDetector
Delete ViewActivity.java
Merge branch 'master' of github.com:bpalchesko/DoggyDetector
Delete WheelActivity.java
Delete EditActivityTest.java
Delete RandomizeActivityTest.java
Delete WheelActivityTest.java
chchchanges
Merge branch 'master' of https://github.com/bpalchesko/DoggyDetector
Delete TrialActivityTest.java
Merge branch 'master' of https://github.com/bpalchesko/DoggyDetector
notes updated
Merge branch 'master' of https://github.com/bpalchesko/DoggyDetector

Conflicts:
	bin/classes.dex
	bin/classes/edu/upenn/cis350/cancerDog/TrialRunActivity$PostJson.class
	bin/classes/edu/upenn/cis350/cancerDog/TrialRunActivity.class
	bin/resources.ap_
	gen/edu/upenn/cis350/cancerDog/R.java
	res/layout/activity_trial_run.xml