adding thumbnails and rmagick gem to app
committing with conflicts resolved