trying to merge branches together
Merge branch 'static-pages'