Merge branch 'master' of https://github.com/jiehg/jiehg.github.io

Conflicts:
	_posts/2014-10-24-addimage.md
s