Blah
Merge branch 'master' of https://github.com/ne0phyte/waveform

Conflicts:
	synth.c

Blah