Fix still dont work; trying again
Merge branch 'master' into lab3_submission

Conflicts:
	Lab3/mazewar/src/Client.java
merge