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

Conflicts:
	TGPlayer.class
	ToneGrid.class