added types
Merge branch 'master' of github.com:dfeltey/synth
Merging to add types