YOLO
Merge branch 'master' of https://github.com/jpugliesi/TimeSeriesComp

Conflicts:
	timeSeriesPackage.py