Merge branch 'HEAD' of git@github.com:polandeme/thinky.git into gh-pages

Conflicts:
	_layouts/default.html
	index.html

Signed-off-by: chinahgr <hgrhkx@qq.com>