added the main contents of the site
fixed merge conflicts