add artist photos to artist page instead of index page, work on getting names of artists to show up in index search
just some clean up, merging back to master
Merge branch '130516-ujs', resolved using 'theirs'

Conflicts:
	app/views/artists/_artistphotos.html.erb
	app/views/artists/index.html.erb
	app/views/artists/show.html.erb
	public/stylesheets/custom.css
just checking in for reference, trying to use artist name instead of artist id as part of the url, not quite working yet, I just want to check in so I have a record of how it *doesnt* work
changed to search for artists by permalink, might be able to get away with just using name turned into a string though
OH YEAH, find_or_create_by! Can now add artists to our db simply by searching for them.