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

Conflicts:
	ToneGrid.java
updated controlpanel.java
8:30pm
Merge branch 'master' of https://github.com/meganchen/ToneGrid