Merging main pages with denis and jess files

trying to get html, js, css to the main file