Merge branch 'mario' of github.com:mleve/tarea1SD into mario

Conflicts:
	src/pacman/ServerStub.java
agregado un filtro al gitignore para eliminar los .class del repo
Merge branch 'master' of github.com:mleve/tarea1SD into mario

Conflicts:
	src/pacman/ServerStub.java