updated changes
all good

Merge branch 'master' of github.com:pmreil/healthcosts

Conflicts:
	app/views/hospitals/show.html.erb
Merge branch 'master' of github.com:pmreil/healthcosts