new home
fixed home page bug
fixed merge conflict