added carrierwave gem
added fog gem and configuration for testing, production, and development
carrierwave uploader modifications
added figaro gem and configuration
added mini magick gem, removed unnecessary lines from config
WIP testing photo model
Merge pull request #2 from Vanderln/carrierwave

Carrierwave - updated gems and config for photo uploading
fixes merge conflict
added carrierwave, figaro, minimagick, and dev gems
fixed associations on questions model, added routes to question controller
carrierwave initial functionality
Merge branch 'master' into new_carrierwave

Conflicts:
	Gemfile.lock