modifi nicola
Merge branch 'gh-pages' of github.com:iefan/blog into gh-pages

Conflicts:
	2013/index.html
	archive.html
	categories/ce-shi.html
	categories/ce-shi.xml
	categories/index.html
	galleries/index.html
	index.html
	posts/hello-world.html
	rss.xml
	sitemap.xml.gz