changes for last set of requests
i dont know why this hates me
Merge remote-tracking branch 'origin/master'

Conflicts:
	our-team.php