html page
html page
Merge branch 'jeremy'

Conflicts:
	app/views/eateries/index.html.erb