merge
Merge branch 'master' of https://github.com/GiantSteps/EvalOnsets

Conflicts:
	src/conf.py