merge about and home

Also updated resume.