Merge branch 'develop'
Merge branch 'develop'
Beginning work for artwork requests
Commit to get up to date with develop since behind
Commit to get up to date with develop since behind
Merge branch 'develop' into artwork-request

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	config/routes.rb
	db/schema.rb
	db/seeds.rb
This branch is solely for showing Nick something
Commit to get up to date with develop since behind
Trying to fix asset pipeline ignoring image files
Trying to fix asset pipeline ignoring image files
Trying to fix asset pipeline ignoring image files
Trying to fix bug within iCheck + asset_pipeline by ignoring retina display improvement
Trying to fix bug within iCheck + asset_pipeline by ignoring retina display improvement
Trying to fix bug within iCheck + asset_pipeline by ignoring retina display improvement
Updating stylesheets trying to fix icheck
Merge branch 'develop-nigel' into develop
Added sunspot and solr to gemfile
SO MANY SEEDS
The seeds, my god
Generated solr stuff. Might remove these files if I find out what they do.