added some static pages and their initial content
merged and resolved conflicts