product recommendations, login, and the cart all together
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/nicklawler222/shopping/MainActivity.java
	app/src/main/res/values/strings.xml
merged w/ master