working on about page
merge conflicts