healthprogress backup voor fragments
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/libraries/appcompat_v7_19_0_1.xml
	Quit.iml
	app/app.iml