merged commit
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