Add my photo
Merge remote-tracking branch 'origin/staging' into add-marco-photo

Conflicts:
	_data/team.yml
Merge pull request #381 from 18F/add-marco-photo

Add my photo