Merge branch 'master' of github.com:shihuiguo/shihuiguo.github.com

Conflicts:
	_posts/blog/2014-05-06-siggraph-asia-talk-notes.markdown
Merge branch 'master' of github.com:shihuiguo/shihuiguo.github.com

Conflicts:
	_posts/blog/2014-05-06-siggraph-asia-talk-notes.markdown