fixes bugs and formatting problems with the budget summary page
solved merge conflict
.
solved merge conflict
fixed obob error
Merge branch 'master' of https://github.com/coldstar96/cse403 into bug-fix

Conflicts:
	src/com/example/budgetmanager/BudgetSummaryAdapter.java
Merge pull request #141 from coldstar96/bug-fix

fixes bugs and formatting problems with the budget summary page