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

Conflicts:
	_posts/2013-5-8-Deal-with-the-problem-of-ideas.md

Signed-off-by: unknown <wangtm@TG-072.ms.domain>