Added Gems
First Crop
cropping
Merge pull request #2 from cs169-2013/BranchEddy

Branch eddy
Setup a basic factory for photos
Setup a basic factory for photos
wrote rspecs for Photo model
rspec for index and new in photos_controller
rspec for create and update happy paths in photos_controller
rspec for create and update happy paths in photos_controller
rspecs for destroy and edit_queue in photos_controller
rspec for make_multiple in photos_controller
factories....
Added PhotoCroping
resolved conflicts
merged cucumber and spec files for iter1
Cucumber tests for login, register, and csv_import
Testing S3
Marked
stories for registration, login, and mass registration by csv