artist test complete
Merge pull request #4 from mikewong79/artist

artist test complete
merged conflicts between owner/master