working on photos
fixed caterer.html merge conflict