Merge Josh's about page & resume page updates