osc1: adsr -> amp
Merge branch 'master' of github.com:abique/shell-dsp

Conflicts:
	shell/osc1.hh