audio sample injector
beat classifier and audio injector built
Merge branch 'sim-subdivide'

Conflicts:
	sw/injector.py
Merge branch 'master' of ssh://github.com/jwcxz/bt