Merge remote-tracking branch 'sam/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MainWorld.java
	GamingWebsite/src/edu/ycp/cs320/gamingwebsite/shared/Player.java
saving the game
trying to connect the views together
database
added a back to homescreen button