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

Conflicts:
	cognitive radio/transmitter.py