Added background for divs
changes to design
attempt to merge with master
Merge branch 'master' into css-fix
fixing merge conflict
Merge branch 'css-fix'

Conflicts:
	app/views/lists/_list_content.html.erb
	app/views/topics/_topic.html.erb