modified picture controller and show
modified controller to correct verb, created comments form
fixed merge conflict