fdsfds
rfdsfsd

Merge branch 'master' of https://github.com/antouk/ts

Conflicts:
	src/main/java/edu/unito/hdmm/timeseries/script/ComputeDistortion.java
	src/main/resources/pool.properties