lol.
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
For Ted.
Small edits, Day 1 marked complete
Merge Izaak's fix to bibliography