work on front page
homepage
index.html start
merging conflicts