Cosmetic
Merge branch 'master' of github.com:fabianp/hrf_estimation

Conflicts:
	hrf_estimation.py