1
Merge branch 'master' of https://github.com/sunguowei/sunguowei.github.io

Conflicts:
	_config.yml
	_layouts/default.html
	_layouts/post.html
	atom.xml