bizarre
Merge branch 'master' of https://github.com/delhayeben/imagetools

Conflicts:
	bandpassfft.m
	player.m