auto
cc
merge branch 'master' of github.com:yangyingchao/blogs

Conflicts:
	entry-list-file
	org/Effective_STL_32.org