One way of making the avatar move
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
Fixed problem where the character walked through walls
Merge remote-tracking branch 'sam/master'

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