display pages
Merge branch 'master' of https://github.com/birch0930/assignment1.git
display pages edited