update
Merge branch 'master' of github.com:10sr/10sr.github.com

Conflicts:
	sub/book.html
	sub/book.md