mergetool test
Merge branch 'static-pages' with 'master'
test
Merge branch 'static-pages'
uptodate
added About page