Merge branch 'master' of https://github.com/ameisso/VisualSynth

Conflicts:
	src/Ball.h
	src/testApp.h
mimi2