First round of combining
with image folder
Changed body tags
mallorys about, no css
with mallorys css
additional tweaks to the update page. Changed the position of the closing article tag as well
This fixed a merge conflict with about.html after pull from upstream
Logo has been added to images folder