Merge branch 'master' of https://github.com/zyangSir/TapRead

Conflicts:
education.xcodeproj/project.pbxproj
冲突