This is the "List of Ratings and Reviews" implementation. RateReviewListFragment has yet to be completed.
I commented out the stuff that made the app crash.
rate/review list working
latest menu's
This is the "List of Ratings and Reviews" implementation. RateReviewListFragment has yet to be completed.
I commented out the stuff that made the app crash.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/RateReviewList'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/nicklawler222/shopping/MainActivity.java
	app/src/main/java/com/example/nicklawler222/shopping/ProductFragment.java
	app/src/main/res/layout/product_fragment.xml
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/RateReviewList'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/nicklawler222/shopping/MainActivity.java
	app/src/main/java/com/example/nicklawler222/shopping/ProductFragment.java
	app/src/main/res/layout/product_fragment.xml
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/RRListDec1'

Conflicts:
	app/src/main/java/com/example/nicklawler222/shopping/ProductFragment.java
	app/src/main/java/com/example/nicklawler222/shopping/SplashActivity.java
fixing merge errors
buttons added to wish list
Merge remote-tracking branch 'origin/wishlistbuttons'
w/ cart stuff