Finished Home page (not including carousel)
merge