commit, trying to exclude the bin/* stuff in future
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
distinct change to dan
Merge branch 'branch_dan'

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