Add home page
merge conflicts resolved