Merge pull request #847 from theannielin/stable

change team, annie
added Javier Cuan-Martinez to the team page
Merge pull request #848 from jcuanm/stable

added Javier Cuan-Martinez to the team page
#837