fixed quiz activity, now asks questions about education
Merge branch 'master' of https://github.com/rc2811/Web_App

Conflicts:
	bin/Web_App.apk
	bin/classes.dex
	bin/classes/com/example/web_app/HomeScreenActivity.class
	bin/classes/com/example/web_app/MyFamilyActivity.class
	bin/classes/com/example/web_app/QuizActivity.class
	bin/classes/com/example/web_app/QuizStartActivity.class
	bin/classes/com/example/web_app/ServerRequest.class
	bin/classes/com/example/web_app/SettingsActivity.class
	bin/dexedLibs/android-support-v4-43e87b0271281e9cf00c459761a15db9.jar
	bin/dexedLibs/facebooksdk-2198b9eeaf5177f98fea7a9ef00bd971.jar
	bin/dexedLibs/google-play-services-b7ea468c25efc26a423e0f0fafb433b8.jar
	bin/dexedLibs/google-play-services_lib-5dd010fd6852f692b6255eeeedba0737.jar
	bin/resources.ap_