added slot number and experiment/control name display
Resolved conflicts

Conflicts:
	gen/edu/upenn/cis350/cancerDog/R.java
	res/layout/activity_randomize.xml
	src/edu/upenn/cis350/cancerDog/RandomizeActivity.java