merging for homepage changes #75

Closed habomane closed 1 year ago