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

Conflicts:
	src/com/catenary/testmerge/MainActivity.java
well shit, .class files and /bin won't go away quietly
Merge branch 'master' into branch_christina

Conflicts:
	bin/classes/com/catenary/testmerge/MainActivity.class
distinct change to _christina
Merge branch 'branch_dan'

Conflicts:
	bin/classes/com/catenary/testmerge/MainActivity.class
	src/com/catenary/testmerge/MainActivity.java