added an instance method to user model that will associate a bar with a user
Merge pull request #23 from RossWittenberg/bars_results

added an instance method to user model that will associate a bar with a ...
added 'add this bar to your list' form to bars/results and added corresponding route to users.
Merge pull request #24 from RossWittenberg/quiz_images

added 'add this bar to your list' form to bars/results and added corresp...
changed route and form to send bar results to @user path rather than users_path
Merge pull request #25 from RossWittenberg/quiz_images

changed route and form to send bar results to @user path rather than use...
added self.quiz_results method to quiz_images model
Merge pull request #26 from RossWittenberg/quiz_images

added self.quiz_results method to quiz_images model
modified controller and model for quiz_iamge
Merge remote-tracking branch 'origin/css'

Conflicts:
	app/views/users/show.html.erb
Merge branch 'master' of github.com:RossWittenberg/search_bar into quiz_images

Conflicts:
	app/assets/stylesheets/application.css.erb
Merge pull request #28 from RossWittenberg/quiz_images

Quiz images
method in users controller which adds bar's business ID to db; working on show method
Merge branch 'master' into users_controller

Conflicts:
	app/views/users/show.html.erb
merge conflict resolved
Merge branch 'users_controller'
merge coflicts fixed
css files merged

Merge branch 'master' into css

Conflicts:
	app/assets/stylesheets/application.css.erb