clinic show layout
merging
Merge branch 'clinics/show'

Conflicts:
	app/actions.rb
	app/views/index.erb
	app/views/layout.erb
	public/css/application.css