moved from catt.com
Merge branch 'master' of https://github.com/jckvideo/jckvideo.github.io

Conflicts:
	blog/_layouts/default.html