adding homepaage assets and style
merge conflict