mac changes
Merge branch 'master' of https://github.com/cecidisi/RankingViz

Conflicts:
	scripts/vis-controller.js