Merge branch 'master' of https://github.com/kkmann/Martin

Conflicts:
	jumpdetection.R
	outlier_analysis.R
Merge branch 'master' of https://github.com/kkmann/Martin

Conflicts:
	jumpdetection.R
	outlier_analysis.R