Merge branch 'master' of https://github.com/victly/COGS187AFINAL

Conflicts:
	process-findArtist.html