added the landing.html for the landing page, structure is set, I'm yet to complete the page
fixed merge conflict in style.css