Made minor style changes based on Rubocop suggestions.
Addedcarrierwave image upload functionality
configuring carrierwave upload
Added carrierwave for file uploads. Can add a profile picture to a user account when editing the account only (for now).
Added image column to memes and allowed for uploading pictures via Carrierwave when creating or editing a meme. Image displayed is from DB presently, will store files on AWS eventually. We still require a url to the original source of the meme.
Added function to convert cap maximum image sizes and create smaller thumbnail versions for the index page.
Added default images for useres and memes.
Set up heroku app with postgresql db and keys for AWS.
Finished up Carrierwave, test suite still needs to be completed (first time using gem, so tests were not written first).
Resolved merge conflicts with previous version of carrierwave branch.
Updated tests to check for presence of images on meme index and show pages.
made changes from eric, ensure all tests passing
set up admin namespace, controllers, views, tests
updated test to use let method
added admin controls for user promotion and deletion
wrote tests for admin user tasks
resolved merge conflicts
got all tests passing, added testing for review callback
Merge pull request #12 from jacindaz/carrierwave

Carrierwave
updated from adam's comments, still need to add pagination when kaminari is merged