html page
made all of the pages able to navigate
html page
Merge branch 'jeremy'

Conflicts:
	app/views/eateries/index.html.erb
merging jeremy and angela
successfully merged
email bar