login logout
icon css

Merge branch 'master' of github.com:RossWittenberg/drink_finder into views

Conflicts:
	search_bar_app/config/routes.rb
Merge pull request #8 from RossWittenberg/views

Views
Merge branch 'master' into quiz_images

Conflicts:
	search_bar_app/config/routes.rb