Merge branch 'master' into photo-upload
deleted debugging code
added gems: carrierwave, carrierwave-aws, minimagic
added carrierwave.rb
rails generate Kitchen_photos uploader
added kitchen_photos_uploader
.gitignore public/uploads
added photo.scss
added file_zie_validator and en.yml file
added photos model
added kitchen_id to photos
added association between kitchen and photo
re-arranged bi-directional associations between photo and kitchen
deleted gallery_limit version
mounted KitchenPhotoUploader to kitchen.picture; added validation
rails g controller photos
added routes and controller action for creating new photo
added
'add photo' button to my kitchens
added new photo view and new_photo_form
deleted photos.rb; reconfigured associations between photo and kitchen