Initial commit
halp
Create index.html
Merge branch 'source'
Merge branch 'master' of github.com:satifice/satifice.github.io
what
Octopress init
Site updated at 2013-11-25 20:17:38 UTC
new host
Create CNAME
Update CNAME
Update CNAME
edit about page
new post
Merge branch 'master' of github.com:satifice/satifice.github.io

Conflicts:
	index.html
Merge pull request #1 from satifice/master

jhkjh