stuff
Merge branch 'master' of github.com:pat-thomas/overtone-playground

Conflicts:
	src/overtone_playground/sounds.clj