Included a Genre object in CircleInCircle, Made improvements to ToolTip
Merge branch 'master' of https://github.com/epurcell3/Million-Song-Data-Vis

Conflicts:
	Java/src/visualizations/CircleInCircle.java
Fixed conflicts