Changed wording to team instead of club
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/upper_header.php