add butt
Merge branch 'Chris(budgets)'

Conflicts:
	bin/classes/com/goldfish/Home.class
	bin/classes/com/goldfish/ManualEntry$AndroidSpinnerActivity.class
	bin/classes/com/goldfish/ManualEntry.class
	bin/classes/com/goldfish/R$id.class
	bin/classes/com/goldfish/R$layout.class
	bin/classes/com/goldfish/R$menu.class
	bin/classes/com/goldfish/R$string.class
	bin/classes/com/goldfish/R$style.class
	bin/classes/com/goldfish/Settings.class
	gen/com/goldfish/R.java
10.13.5