cool changes
Merge branch 'master' of https://github.com/connorbrinton/JestureJams

Conflicts:
	src/com/c2/sound/SoundGenerator.java