Combined all the pages

Combined the redesign and original site