update

Conflicts:
	about.html
	archive.html
	cafe.html
	contact.html
	index.html
	posts/2014-02-02-test.html
	posts/2014-02-06-alive.html
	posts/2014-02-08-secSakura.html
	posts/2014-02-15-kei.html
	posts/2014-07-05-secSakura10.html
	posts/2014-07-12-knctSG2.html
	product.html
	sweets/barCake.html
	sweets/chocoBrownie.html
	sweets/cookie.html
	sweets/eggTarte.html
	sweets/millecrepe.html
	sweets/peachTarte.html
	sweets/scone.html
	tags/computer.html
	tags/others.html
	tags/security.html
	tags/study-group.html