first commit
cmpweb-updates2-13-2

fixed irma rangels email to irmay.rangel
Merge branch 'gh-pages'
update2-13-3

update post merging branches.
commit 4-22-2014

added lisa poon new staff cmp
20140506-grants+fellows

updated grants and fellows
Merge pull request #4 from pwerba/gh-pages

incorporating Peter's updates to cmp prod