backup
Merge branch 'master' of https://github.com/Nieltz/MA

Conflicts:
	RecordedData/findShifts.m
	algoMain.m