fusion
fusion
Merge branch 'master' of https://github.com/maalvagu/restapp1

Conflicts:
	app/controllers/publics_controller.rb
	app/controllers/restaurants_controller.rb
	app/views/layouts/_navbar.html.erb
	app/views/neightborhoods/index.html.erb
	app/views/neightborhoods/show.html.erb
	app/views/publics/contact.html.erb
	app/views/publics/search.html.erb
	app/views/restaurants/index.html.erb
	app/views/restaurants/list_for_city.html.erb
	config/routes.rb