Modify
Merge branch 'master' of https://github.com/ccpaging/books

Conflicts:
	Algebra1/src/代数1.1有理数.lyx