Updated about page
Merge branch 'aboutpage' into develop