added static pages, rerouted root to homepage
merged conflict ...