working on new waveform for use with Dazzler
trying a fsm and new version of pyvisa
basic working version, no gui
working waveform generation with new waveform
Merge branch 'master' into HEAD

Conflicts:
	wavegen.pyw
Merge pull request #2 from antonl/fsm-rewrite

FSM rewrite