added carrierwave, fog, and mini_magick gems, edited image_uploader.rb to be able to show images
added the setting for uploading to amazon s3
modified s3.rb with infor for further refference, as of now we need the controllers to add the image_sets and add the settings to assign images to each set
Created all controllers with these methods: Show, Index, Create model_name_params. All working on my local server.
Ammending merge conflicts.
Rolled back migrations.
Trying to resolve merge conflicts.
Copy and pasted schema file from master branch.
Copy and pasted user model from master branch.
Copied schema and user.rb files from master branch after running a git pull from the upstream in that branch. Pasted those files over their sibling files in the create_controllers4 branch to ammend merge conflicts.
Merge branch 'create_controllers4' of github.com:CollinBlinder/pixelect-api into create_controllers4
Trying to solve mystery of the changing gemfile.
removed error markers from gemfile and gemfile lock.
Merge pull request #13 from CollinBlinder/create_controllers4

Created Controllers, reset to upstream on 4th iteration of create_controllers branch.
created basic API tests

created API requests spec folder

filled out skeleton for commets, image sets, image, user specs

updated image spec

updated specs with signed in vs not signed in responses
Merge pull request #14 from rpazyaquian/adding_api_tests

created basic API tests
Merge branch 'master' of github.com:ga-wdi-pixelect/pixelect-api
added rmagick gem, edited mageSet model, added a comment to the schema
fixed image model
added the update to the image_sets_controller, and changed the create to be able to upload more than one image for the set