Added landing page
Fixed merge