still working on quiz images...
modified quiz images controller to randomize categories
resolved merged conflict in quiz images model
Merge branch 'master' into new_quiz_images

Conflicts:
	app/models/quiz_image.rb
merged
Merge branch 'new_quiz_images'