merge origin
Merge branch 'master' of https://github.com/desty/desty.github.io

Conflicts:
	_site/2014/01/03/test/index.html
	_site/archive.html
	_site/atom.xml
	_site/index.html
	_site/rss.xml
	_site/sitemap.txt
delete files