capability to edit defaults
Merge branch 'master' of https://github.com/davidwan/CancerDog

Conflicts:
	gen/edu/upenn/cis350/cancerDog/R.java
	src/edu/upenn/cis350/cancerDog/RandomizeActivity.java
Merge branch 'master' of https://github.com/davidwan/CancerDog