here are my changes
Merge remote-tracking branch 'Josh/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/theCalendar.java
updated the calendar
Merge remote-tracking branch 'Jake/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetApparatusController.java
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/FormView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java