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

Conflicts:
	src/GUI.java
2 Textfield and 1 Label added
calculate fuction added
Merge branch 'master' of git@github.com:www40/GitDemo2.git

Conflicts:
	src/GUI.java