final for the 29th night

swag
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team.html
	index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team.html
	index.html