updated team page
Merge branch 'james'
updated bios
Merge branch 'james'