add about page
Merge branch 'master' into pat-branch