fonts
still working on quiz images...
fonts again
fonts
modified quiz images controller to randomize categories
Merge branch 'master' of github.com:RossWittenberg/drink_finder
rewrote quiz_images_controller
Merge pull request #51 from RossWittenberg/css

user show page
refactored
merged font changes
Merge remote-tracking branch 'origin/views'

Conflicts:
	app/views/layouts/application.html.erb
ditto
merged font changes

Merge remote-tracking branch 'refs/remotes/origin/master'
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'
images and application layout
Merge branch 'master' of github.com:RossWittenberg/search_bar into quiz_images_refactor
Merge pull request #52 from RossWittenberg/quiz_images_refactor

Quiz images refactor
changed JPG to jpg
Merge pull request #53 from RossWittenberg/quiz_images_refactor

changed JPG to jpg
user show page css