Merge branch 'new-page' into Styling
Merge branch 'Styling' of https://github.com/Olice/featureBranchWorkflow into Styling