img team
img team

Conflicts:
	config.rb
	source/css/partials/_320grid.sass
	source/css/partials/_960grid.sass