Added scaffolds for artwork, supplies, and medium
Adding schema
Merge pull request #1 from kwoodard22/scaffolding

Scaffolding
relationships created
Merge pull request #3 from kwoodard22/relationships

relationships created
some validation, not yet done
Removed photos from Artists and Artworks
Merge branch 'master' of github.com:kwoodard22/artist_yard_sale

Conflicts:
	app/controllers/artworks_controller.rb
	app/controllers/media_controller.rb
	app/controllers/supplies_controller.rb
	app/models/artist.rb
	app/models/artwork.rb
	app/models/supply.rb
	config/routes.rb
	db/schema.rb
validation kind of working
validation working
Merge branch 'master' of github.com:kwoodard22/artist_yard_sale

Conflicts:
	app/controllers/artworks_controller.rb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb
Merge branch 'master' into paperclip2

Conflicts:
	app/models/artist.rb
	app/models/artwork.rb
	app/models/supply.rb
	db/schema.rb
Remove duplicate migrations
Merge branch 'master' into paperclip2

Conflicts:
	app/models/artwork.rb
	app/models/supply.rb
	db/schema.rb