# Conflicts:
#   Python/waveform.py

waveform.py implementation

See merge request !2

First

File re-organization and python module first commit

See merge request !1