Debugging
we have the ui's switching pages
committing
got all of sams changes and hoping the reset button works

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/GamingWebUi.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MainWorld.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MemView.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/loginView.java
fixed the reset button for Memgame
I have finished the Login page
something
starting to use canvas for the main world class
trying the make the person on the screen to move around
got the main view working
Merge remote-tracking branch 'sam/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MainWorld.java
so we have the man walking around
try to work
commit
minor studd that makes no difference
Merge remote-tracking branch 'Cody/master'

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