Merge branch 'master' of C:\Users\Sander\AndroidStudioProjects\Quit with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
Product in db, behalve img. hij leest nu ook prijs uit uit de db
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml