Signed-off-by: yanshasha <yanshasha133@gmail.com>
Merge branch 'master' of github.com:yanshasha/yanshasha.github.com

Conflicts:
	_includes/themes/dinky/default.html