Two new pages
Merge branch 'new-feature'