quiz
Merge branch 'master' of
git@github.com:MediFamily/PersonalDoctorbutler.git

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml