Octopress init
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Remove old site files
Site updated at 2014-07-16 16:21:07 UTC