sync ELLE
Merge branch 'master' of https://github.com/ekicyou/ekicyou.github.com

Conflicts:
	2014/03/10/test.html
	about.html
	atom.xml
	index.html
	rss.xml
sync ELLE