hey
Merge branch 'master' of https://github.com/st-a/radial-vis

Conflicts:
	RadialTimeline/src/sketchBundlingEdges.java