Fix table styles a bit
Merge branch 'master' of github.com:matthewnewell/sample_app

Conflicts:
	app/views/campaigns/show.html.erb
	app/views/recipients/_recipient.html.erb