Initial commit
???

Merge branch 'master' of https://github.com/satifice/satifice.github.io
Merge pull request #1 from satifice/master

I don't know what i'm doing....