Merge branch 'master' of https://github.com/rapjac/garm

Conflicts:
	Garm/ControlThread.pde
Merge branch 'master' of https://github.com/rapjac/garm

Conflicts:
	Garm/ControlThread.pde