Octopress init
Merge branch 'master' of github.com:tonydeng/tonydeng.github.io

Conflicts:
	index.html
Site updated at 2014-12-08 02:42:08 UTC