Work on the Main view class
Merge remote-tracking branch 'sam/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MainWorld.java