merging ubuntu and apple
Merge branch 'master' of https://github.com/rossebv/RadMAP-Operatinos-GUI