working on linking relatiely.
Merge branch 'master' of github.com:miketalley/streetperformr

Conflicts:
	app/views/artists/show.html.erb
	db/seeds.rb