Worked on grocery crash occurrence. Tests fine on its own so the crashes might be somewhere else. Worked on layouts and sort function.
Merge remote-tracking branch 'origin/master' into AlecLocal

Conflicts:
	app/src/cap/mizzou/rmtrx/app/grocery/GroceryActivity.java
Began creating a universal design theme. Moved around and cleaned up login, finances, and residence information layouts. Worked on sorting more, but not done
Worked on grocery crash occurrence. Tests fine on its own so the crashes might be somewhere else. Worked on layouts and sort function.
Worked on dashboard and getting icons displayed next to the activity names; not finished, still has errors in it.
update
Merge remote-tracking branch 'origin/master' into AlecLocal

Conflicts:
	app/res/layout/registration_page.xml
	app/res/layout/user_info_page.xml
	app/src/cap/mizzou/rmtrx/app/ui/HomeFragment.java
Started work on splash screen
Splash screen. Fixed theme not working
figured finance error
Merge remote-tracking branch 'origin/master' into DesiBranch

Conflicts:
	app/src/cap/mizzou/rmtrx/app/ui/HomeFragment.java
	rmtrxdev/AndroidManifest.xml
Having issues, need to compare to BenBranch
HomeActivity fix
fixed finance homescreen error//number pad works for money input
fixed finance homescreen error//number pad works for money input
fixed finance homescreen error//number pad works for money input
Merge branch 'master' into DesiBranch

Conflicts:
	app/src/cap/mizzou/rmtrx/app/ui/HomeFragment.java
	rmtrxdev/AndroidManifest.xml
SplashScreen working. Working on animating.
bb works
finance db works//activity allows you to add transactions; calculates account balance and displays