atom.xml
Merge branch 'master' of https://github.com/wangbaomi/wangbaomi.github.io

Conflicts:
	atom.xml

pull