small refactor
Merge branch 'develop' of github.com:b97pla/scilifelab
added pulse_conversion.py script
Merge branch 'master' of github.com:SciLifeLab/scilifelab into develop
dummy edit
Merge pull request #292 from b97pla/master

Added pulse conversion script