ignore (committing just to sync with your version)
Merge branch 'master' of https://github.com/meganchen/ToneGrid

Conflicts:
	ControlPanel$ButtonListener$1.class
	ControlPanel$ButtonListener.class
	ControlPanel.java
	TGPlayer.class
	TGPlayer.java
blah