jekyll demo
Merge branch 'master' of github.com:HerculesShek/HerculesShek.github.io

Conflicts:
	_config.yml