initial commit
landing page
update pages
fixed merge conflicts