added carrierwave and simulated asynchronous file uploading via iframe targeting method
added thumbnail resizing to carrierwave uploader and imagemagick install
resolving merge conflicts