Add Justin's changes.
Merge.
Render favicon.