Working on new home page copy
Fixed home page bug
Fixed merge conflict and merged in the new home page