Fixed a problem where both clients get killed when firing face to face
Merge branch 'master' into lab3_submission

Conflicts:
	Lab3/mazewar/src/MazeImpl.java