genre labels
Merge branch 'master' of https://github.com/flameiguana/project2-cmps179

Conflicts:
	scripts/visualization.js
merged