syntax issue
Merge branch 'master' of https://github.com/mwmarzin/DrinkChewGuru

Conflicts:
	app/views/venues/search.html.erb
commit
Merge branch 'master' of https://github.com/mwmarzin/DrinkChewGuru