Merge branch 'master' of https://github.com/n0mjs710/DMRlink

Conflicts:
ipsc.py