44
Merge branch 'master' of https://github.com/wangtm/wangtm.github.com

Conflicts:
	_posts/2013-1-31-js-regular-expression-search-method-to-explain.md