head
Merge branch 'master' of github.com:tamagazzi/FFT_synth_one

Conflicts:
	Source/PluginProcessor.cpp