added carrierwave, figaro, minimagick, and dev gems
fixed associations on questions model, added routes to question controller
carrierwave initial functionality
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
Merge pull request #4 from Vanderln/new_carrierwave

New carrierwave - new gems