Added routing
Content changes
Merged homepage design with option to move to different pages
navbar back to old