updated about page
Merge branch 'master' into design_demory