login activity talks to database
navigation bar w/ search
images
unescaped ' and min sdk
unescaped ' and min sdk
working login activitie with push
working navigation and login
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
Product List done + Product page started
Product List done + Product page started
working on product fragment
Merge remote-tracking branch 'origin/initialUI' into initialUI
recommitting with files

crashing after login
crashing after you choose a category
IT WORKS AGAIN

and you can log out
and the login doesn't say email anymore
with new icons
Merge remote-tracking branch 'origin/initialUI' into initialUI

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
fixed activity_login xml
working on product fragment