Displaying multiple time series.
Merge branch 'master' of https://github.com/palimpsests/timeSeriesVisualizer

Conflicts:
	py/parseJSON.py