Merge pull request #4 from Pweb-fpuna/master

asd
bootbox add
varios
Merge pull request #12 from divina0210/master

cambios