blabla
Merge branch 'master' of https://github.com/stojadin/uhd_daemon

Conflicts:
	uhd_daemon.cpp