working on new homepage copy
fixed home page bug
Fixed merge conflict and merged in the new home page