updated team copy
Merge branch 'master' of github.com:zucchi/website

Conflicts:
	site/tmpl/team.php