deploy
Merge branch 'master' of https://github.com/AnneSophieRowr/akaafair

Conflicts:
	app/controllers/admin/artists_controller.rb
	app/models/artist.rb
	app/models/exhibitor.rb
	app/views/admin/artists/_form.html.haml
	app/views/admin/exhibitors/show.html.haml
	db/seeds/development.rb