1.md added
Merge branch 'master' of github.com:dnxiaochou/dnxiaochou.github.com

Conflicts:
	_config.yml