Generate site
Generate site
Generate site
Generate site
Resolved merge conflicts.
Renames about.html to about.markdown. Adds markdown content.
Regenerates site.