new ERB
more controller and erb logic
Grabbing avatar
Merge remote-tracking branch 'origin/erb-controller-edits'
Fix show.erb?