ignorar
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Jugar.class
	src/Jugar.java
error