reacomodo disenio de la nota - 2
Merge branch 'master' of https://github.com/inodata/flora.git