Merge branch 'master' of github.com:mleve/tarea1SD

Conflicts:
	src/pacman/ServerStub.java
Merge branch 'master' of github.com:mleve/tarea1SD