Fixed some of the comments on AddBudget/EntryActivity to be more unified. Fixed some misspellings too.
Merge branch 'master' of https://github.com/coldstar96/cse403

Conflicts:
	src/com/example/budgetmanager/AddBudgetActivity.java
basics of implementing settings figured out; string resources and settings layout xml's defined
basic listener for options menu selection set up
made addEntryActivity inflate the menu options. will do the same for the rest.
inflated options menu for all applicable activities, and made them temporarily handle a click to go to the options screen with a toast.
fixed which activity should inflate menus. inflated menu with settings and sign out selections and made them temporarily handle both by toasting.
Finished dummy settings (with only string selections).
Merge branch 'master' of https://github.com/coldstar96/cse403

Conflicts:
	src/com/example/budgetmanager/AddEntryActivity.java
Merge branch 'master' into settingsActivity

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/example/budgetmanager/LogoActivity.java
	src/com/example/budgetmanager/LogsActivity.java
Set up EntryLogsActivity's menu options.
Set up default values for settings.
The summaries of the preference react dynamically to current preference settings.
Starting Screen settings implemented.
fixed add budget style
fixed add entry style; made the theme include title bars.
Merge branch 'master' of https://github.com/coldstar96/cse403
Merge branch 'master' into settingsActivity

Conflicts:
	AndroidManifest.xml
	src/com/example/budgetmanager/AddBudgetActivity.java
	src/com/example/budgetmanager/EntryLogsActivity.java
	src/com/example/budgetmanager/LogoActivity.java
merged master into settings
Merge branch 'settingsActivity' into themeFix

Conflicts:
	AndroidManifest.xml
	res/layout/activity_add_budget.xml
	res/layout/activity_add_entry.xml
	res/values/strings.xml
	res/values/strings_activity_add_budget.xml
	src/com/example/budgetmanager/AddEntryActivity.java