blog
Merge branch 'master' of https://github.com/ipaler/ipaler.github.io

Conflicts:
	archives/index.html
	atom.xml
	index.html
	sitemap.xml
del all