starting home page
started home
fixed merge conflicts