Added greg's logo to the header and adjusted the CSS accordingly
Merge branches 'master' and 'logo'