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'
major changes to DerbyDatabase. Implemented LoginController with method
loginUser
made changes for secure connection to server
Merge remote-tracking branch 'sbonner1/master'
back to normal
recommit
Merge remote-tracking branch 'sbonner1/master'
trying to fix updateUserScore
Merge remote-tracking branch 'sbonner1/master'
derby database change
commit updates to server
Merge remote-tracking branch 'sbonner1/master'
fixed login
added comments to code
Resolved all conflicts (like a boss).

Merge remote-tracking branch 'jcoady9/master'

Conflicts:
	FinalProjectControllers/src/edu/ycp/cs496/ghosts/model/persist/DerbyDatabase.java
	FinalProjectControllers/src/edu/ycp/cs496/ghosts/servlets/DatabaseApp.java