links updated on home page
merged conflict