TYP: grammar issue in max's description
Add Karissa to team
Merge branch 'gh-pages' of https://github.com/karissamck/website into karissamck-gh-pages

Conflicts:
	team.html
Merge branch 'karissamck-gh-pages' into gh-pages