fixed home page
resolved merge conflicts on home page

yo