avanze mazo.java + campos usuario
Merge remote-tracking branch 'origin/master'