Calendar is being updated
calendar updated...needs home on site
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/Ycp_cs320_project_ui.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/calendar.java