updata

hello word @hgping918
Merge remote-tracking branch 'origin/master'

Conflicts:
	CNAME
Merge branch 'master' of https://github.com/hgping918/hgping918.github.io

Conflicts:
	_includes/footer.html