trying to resolve issue
Merge branch 'master' of https://github.com/mwmarzin/DrinkChewGuru

Conflicts:
	app/controllers/venues_controller.rb