Exercise set #1 completed
Exercise Set 2 described
Merge branch 'exercise_2_setup' into exercise_2_completion
Exercise set #2 completed
order table styling
Base exercise 3 steps
Exercise 3 and partial challenge 1
Merge branch 'exercise_2_completion'

Conflicts:
	Gemfile
	app/assets/stylesheets/orders.css.scss
	app/controllers/orders_controller.rb
	app/models/order.rb
	app/views/layouts/application.html.erb
	app/views/orders/_form.html.haml
	app/views/orders/index.html.haml
	app/views/orders/show.html.haml
	config/routes.rb
	db/schema.rb
	test/fixtures/orders.yml