secondary peak ignore
Merge branch 'master' of https://github.com/chronopoulos/cyclophone

Conflicts:
	cpp/cyclosensors/cyclomap.cpp
	cpp/cyclosensors/main.cpp