update
update
Merge branch 'gh-pages' of github.com:niushuai/reading into gh-pages

Conflicts:
	404.html