Added downsampling
Merge branch 'master' of https://github.com/jnshi/6784project

Conflicts:
	code/audioprocessor.pyc
	code/features.py
	code/features.pyc
	code/sandbox.py