Merge branch 'master' of https://github.com/coldstar96/cse403 into edit

Conflicts:
	res/values/strings.xml
Added boolean for add mode.
Fixed styles
Merge branch 'master' of https://github.com/coldstar96/cse403 into edit

Conflicts:
	res/values/strings.xml
	src/com/example/budgetmanager/EntryLogsActivity.java
Merge pull request #106 from coldstar96/editBudget

Added the edit budget functionality
merged with master