Merge branch 'master' of https://github.com/elizabrock/greenthumb into add-shapes-to-garden-plan

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/schema.rb
Merge branch 'add-shapes-to-garden-plan' of https://github.com/elizabrock/greenthumb into add-shapes-to-garden-plan

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/schema.rb
Merge branch 'master' into add-shapes-to-garden-plan
Merge branch 'add-shapes-to-garden-plan' of https://github.com/elizabrock/greenthumb into add-shapes-to-garden-plan
Merge branch 'add-shapes-to-garden-plan' of https://github.com/elizabrock/greenthumb into add-shapes-to-garden-plan
progress on tests for adding a shape to the middle of the garden