added artist page, content still missing
Merge remote-tracking branch 'origin/master'