worked on about page and cleaned up other areas
merge conflick