working
something
Merge remote-tracking branch 'Cody/master'

Conflicts:
	GamingWebUi/war/derby.log
	GamingWebsite/Junits/edu/ycp/cs320/gamingwebsite/UI_test.java