Merge branch 'master' of https://github.com/PapaMarky/ArduinoSketchbook

Conflicts:
	LED_Circle_Clock/template_maker/template_maker.pde