Some more cleanup, add voice 3
Merge branch 'canon' of github.com:HopelessProgrammingInterns/arduino-canon-pachelbel into canon

Conflicts:
	ChristmasMelody/ChristmasMelody.ino
Various fixes included, had to cut down voice 2 and 3 to stay within
the memory limit