changed create in users_controller so that when a user is created it redirects that new user to root and stays signed in
fonts
fonts
Merge pull request #48 from RossWittenberg/css

fonts
quiz images edit...
Merge pull request #47 from RossWittenberg/login__homepage

changed create in users_controller so that when a user is created it red...
fonts again
fonts
Merge branch 'master' of github.com:RossWittenberg/drink_finder
user show page
Merge pull request #51 from RossWittenberg/css

user show page
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