Twinkle: master branch - first commit
修改 twinkle 預設的文章
Merge branch 'master' into gh-pages

* master:
  修改 twinkle 預設的文章
  Twinkle: master branch - first commit

Conflicts:
	_posts/2013-07-25-hello-twinkle.markdown
	js/app.js