unescaped ' and min sdk
unescaped ' and min sdk
working login activitie with push
working navigation and login
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
working on product fragment
Merge branch 'integration' into stuff

Conflicts:
	.idea/misc.xml
	app/src/main/java/com/example/nicklawler222/shopping/HomeActivity.java
	app/src/main/java/com/example/nicklawler222/shopping/LoginActivity.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/values/strings.xml
combined product fragment and categories