malong
Merge branch 'master' of github.com:lifang/exercise_book

Conflicts:
	res/layout-1824x1200/answer_select.xml