Merge pull request #13 from rockamorales/master

merge
Merge pull request #14 from rockamorales/master

merge
Merge branch 'master' of github.com:schumy21/ClinicaWeb.git
Merge pull request #15 from rockamorales/master

Mas modificaciones
Merge branch 'master' of github.com:schumy21/ClinicaWeb.git
Merge pull request #44 from mackk/master

admin
Merge pull request #45 from schumy21/master

Modificaciones Schumy
Merge pull request #20 from rockamorales/master

Merge