my portfolio
Merge branch 'master' of https://github.com/qiudengfeng/qiudengfeng.github.io

Conflicts:
	_includes/footer.html
	_includes/header.html
	_layouts/default.html
	_posts/2014-04-22-hello-world-3.md