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

Conflicts:
	src/GUI.java
added Gui for Calculator
Function Added
Merge branch 'newFeautre'

Conflicts:
	src/GUI.java