init new page
update home page nav
merged conflict home page
merged conflict home page again
merged conflict home page