test
set cname
nothing..
ok
modify the index.html
index.html
add testile.html
index.html to index.textile
index2.textile
test.textile
add new files
index.html
404= index
...
del all files
merge test
Merge branch 'master' of github.com:nshen/nshen.github.com
init jekyll
init jekyll
Merge branch 'master' of github.com:nshen/nshen.github.com

Conflicts:
	_posts/2011-07-19-zhihu.textile
	atom.xml
	log.html