commit _christina
commit from branch_dan
Merge remote-tracking branch 'origin/branch_christina'

Conflicts:
	src/com/catenary/testmerge/MainActivity.java