Merge pull request #2 from mwvd/mackenzie

Merge aaaaah
Merge pull request #3 from mwvd/mackenzie

damp v0.5
Merge branch 'theresa' into gh-pages

fix typo
"Issue #1: Oil Money" is now "Issue #0: Icarus"
organization
add essay section
change text
fix conflicts