more stuff
Merge branch 'master' of https://github.com/DavidHaitch/ToneWand

Conflicts:
	ToneWand.ino