let's test
is it right?
Merge https://github.com/diufanshu/GeoQuiz

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	README
	gen/com/example/geoquiz/R.java
	res/layout-land/activity_quiz.xml
	res/layout/activity_cheat.xml
	res/layout/activity_quiz.xml
	res/layout/fragment_quiz.xml
	res/menu/quiz.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values-w820dp/dimens.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/geoquiz/CheatActivity.java
	src/com/example/geoquiz/CheatOrNot.java
	src/com/example/geoquiz/TrueFalse.java