redline back in production
banner
grid
Merge branch 'landing1.1' into elena

Conflicts:
	app/views/layouts/_header.haml
	public/stylesheets/application.css
	public/stylesheets/mailing-list.css
fix
Merge branch 'elena' into new_content

Conflicts:
	app/views/layouts/_header.haml
	public/stylesheets/application.css
	public/stylesheets/mailing-list.css
fix