fuck messed up git
Merge branch 'master' of https://github.com/peragwin/cognitive-radio.git