add files
Merge branch 'master' of github.com:guitao/guitao.github.com

Conflicts:
	_config.yml