updating specs, jbuilder
added seeds
fixed views for comments, created views for users
cleaned up image set json
adding factory girl and faker for seeding on heroku
update git status
updated comment and image set json
Merge pull request #20 from rpazyaquian/adding_json_stuff

Adding json stuff
fixed users and images controller

fixed images controller
Merge pull request #21 from rpazyaquian/fixing_user_controller

fixed users and images controller
added amazon controller and model
updated gemfile, cleaned gemfile.lock, configured routes.rb, and added necesary lines for application.rb
Merge pull request #22 from cxoltero/testS3api

Test s3api
added voting functionality to images

ran rails g acts_as_votable:migration, ran rake db:migrate

added acts_as_votable to image model

generated migration for cached votes, updated schema
Merge pull request #23 from rpazyaquian/adding_acts_as_votable

added voting functionality to images
Copy and pasted gemfile from upstream.
Copy and pasted gemfilelock from upstream.
Copy and pasted image model file from the upstream.