no message
Merge branch 'master' of https://github.com/tenderbolton/farq2014

Conflicts:
	farq2014/src/Layer/GlitchLayer.cpp
-- new mixer added
-- imageOutput minor change