SillyLabel
add Button
Merge branch 'newFeature' of git@github.com:www40/Generalprobe3.git into
newFeature

Conflicts:
	src/GUI.java