pages
rules for static pages
Merge branch 'work'
Merge remote-tracking branch 'origin/master'
update
Merge branch 'work'