update
Merge branch 'master' of git@github.com:lanjeason/lanjeason.github.io.git

Conflicts:
	_posts/2014-05-29-c9-print-templates.md

Signed-off-by: lanjeason <lanjeason@gmail.com>