merge in landing page html to index.html.erb and application.html.erb
fixed merge issues