here
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetCalendarController.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/CalendarService.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/CalendarServiceAsync.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/server/CalendarServiceImpl.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/Events.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/FireCalendar.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/FireCalendarEvent.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/FireCalendarList.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Alana/master'
things
here yall go
merged with everyone
Merge remote-tracking branch 'Drew/master'
Merge remote-tracking branch 'Alana/master'
Merge remote-tracking branch 'Josh/master'
here is what i have
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
here
Merge remote-tracking branch 'origin/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetCalendarController.java
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetContactInfoController.java
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusDetailsView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ContactInfoService.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ContactInfoServiceAsync.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/server/ContactInfoServiceImpl.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
added the RPC call to save things to the database
set the the basic function of the add/get/delete events
here
here 2
working version of adding and getting events into the calendar