Changed artist image displays
Fixed merges with static index and updated artist image display
Merge pull request #33 from dancingshell/Brandon

Fixed merges with static index and updated artist image display