Added paperclip gem, generated paperclip migrations for artists/supplies/artwork
some validation, not yet done
Added photo validations, views, etc.
Changed model, photo_form
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
Fixed photo submission
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
Merge pull request #5 from kwoodard22/paperclip2

Paperclip2
deleted first migration of devise
Worked on photo form
Fixed photo issue
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile
	app/views/artworks/index.html.erb
	app/views/artworks/show.html.erb