jydgfyusijfdeo
2.0
Updated UI

Launcher, Login, Navigation UI and logos
Overide last UI changes

whoops, I think I was logged into another account when I made the last
commit.

Here we go again!
login working w/ database and splash screen
navigation bar w/ search
images
Merge branch 'initialUI' of https://github.com/nicklawls/Shopping

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/nicklawler222/shopping/MyActivity.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/menu/my.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/strings_activity_login.xml
Merge branch 'initialUI' of https://github.com/nicklawls/Shopping

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/nicklawler222/shopping/MyActivity.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/menu/my.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/strings_activity_login.xml