Button added
Button added
Merge branch 'newFeature' of https://github.com/www40/Cal.git into
newFeature

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

Conflicts:
	src/GUI.java