Drop in the new granular synth, comment out contour stuff
Calculate average of each RGB channel and send values to the synth
Make sound stop on quitting, move reverb out into new patch, begin new sound for movement
manual merge for some reason idk
Merge branch 'master' into new-synth

Conflicts:
	ZenBox/src/com/zenbox/ZenBoxActivity.java
Merge branch 'master' of github.com:awdavies/ZenBox