so I can merge
Merge remote-tracking branch 'josh/master'
WEB SERVICE WORKS! (for drew)
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java