Gui Button added
Gui Button added
Merge branch 'newFeatureextra' of git@github.com:www40/G4.git into
newFeature

Conflicts:
	src/GUI.java
Added Textfields
Merge branch 'newFeature'

Conflicts:
	src/GUI.java