Working Version
Merge branch 'master' of https://github.com/meganchen/ToneGrid

Conflicts:
	ControlPanel.java
	TGPlayer.class
	TGPlayer.java