Merge pull request #110 from mackk/master

Control Citas
Merge pull request #12 from rockamorales/master

merge