更改目录结构，添加resume
Merge remote-tracking branch 'origin/master'

Conflicts:
	2014-08/28/index.html
	archives/2014/09/index.html
	archives/2014/index.html
	archives/index.html
	index.html
	tags/instanceof/index.html
	tags/length/index.html
	tags/setInterval/index.html
	tags/setTimeout/index.html
	tags/typeof/index.html
	tags/鏁扮粍/index.html