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

Conflicts:
	gen/com/comdosoft/ExerciseBook/R.java