try new template
Merge remote-tracking branch 'blog/master'

Conflicts:
	.gitignore
	Rakefile
	_config.yml
	_posts/2013-01-10-my-first-blog.md
	_posts/2013-01-12-a-test-from-p1620.md
	_posts/2013-01-13-markdown-syntax.md
	_posts/2013-01-14-Markdown-Syntax-Simplelified-Chinese.md
	_posts/2013-01-14-Markdown-syntax-index.md
	atom.xml
ok`