fixed merge conflict
Merge branch 'master' of https://github.com/D34thStalker/Processing-QMan

Conflicts:
	gui.pde