false to true
something
messing around
Merge remote-tracking branch 'origin/leshoppe' into code

Conflicts:
	app/src/main/res/layout/activity_my.xml
ui and database prototype
Merge pull request #2 from nicklawls/code

working
Merge branch 'master' into stuff

Conflicts:
	app/app.iml
overwrote product-id field with product rating