Updated homepage + html version
merge conflicts