updated about page
Merge branch 'james'
updated phil bio
Merge branch 'james'