Uploading the derby log
derby
Merge remote-tracking branch 'shamor/master'
player class junits with complete coverage
Merge remote-tracking branch 'Cody/master'

Conflicts:
	GamingWebUi/war/derby.log
	GamingWebsite/Junits/edu/ycp/cs320/gamingwebsite/UI_test.java
Player class Junits, complete coverage
Sped up the avatar
Merge remote-tracking branch 'sam/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MemView.java
	GamingWebUi/war/derby.log