ricardo: recuperacion
Merge branch 'ricardo' into tarea3

Conflicts:
	src/pacman/Board.java
	src/pacman/ServerInterface.java
	src/pacman/ServerStub.java