ERB/Controller_changes
add erb
Merge remote-tracking branch 'origin/controller_edits2'
Merge remote-tracking branch 'origin/views-edit'

Conflicts:
	app/views/show.erb