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

Conflicts:
	index.html
Site updated at 2014-03-22 11:33:59 UTC