fix oversight in merge
added about page
updated about page
merging changes