update to homepage and sites#index
merge conflicts for site stylesheet and site index.html.erb resolved
resolved merge conflicts