cleaned up html code
changed the logo
fixed merge conflict that had two of the same img tags