Redid welcome page layout
resolved merge conflicts for layout.html and welcome.html