finished for first new page
Merge branch 'master' of https://github.com/janwuiii/Project1