fix
Merge branch 'master' of https://github.com/crabalockerfishwife/motion-capture-ping-pong

Conflicts:
	GloveTrack/GloveTrack.pde