adding home page
adding home page html file
fixing merge conflicts