version 1.0 terminada
solve merge
Merge branch 'master' of git@github.com:c14ivan/Hospital.git