ugh
Merge branch 'master' of https://github.com/peragwin/cognitive-radio

Conflicts:
	cognitive radio/test_audio.py
ok
ugh