small changes to the database
Merge remote-tracking branch 'jcoady9/master'

Conflicts:
	FinalProjectControllers/src/edu/ycp/cs496/ghosts/model/persist/DerbyDatabase.java
	
	fixed user class problem
comments and minor changes to the database and controller classes
Merge remote-tracking branch 'sbonner1/master'
made changes for secure connection to server