Updated gui
Merge branch 'master' of https://github.com/sheltonr/ICS414.git

Conflicts:
	Sangiovese/src/iCalendarGUI.java