nuevo layout piecol
fix merge
Merge branch 'master' of github.com:v4l3nt1n/reporting