Restaurant pages (in progress)
Restaurant pages (in progress)
Merge branch 'origin/restaurant_branch'

Conflicts:
	Gemfile.lock
	app/controllers/restaurant_controller.rb
	app/views/layouts/application.html.haml