allow for resizing
made photos controller and #new
made image upload field adn display on restaurant show page
resolved merge conflicts in the restaurant #show page