Merge branch 'master-qa' into egomez
Bug Fixes DONE
Merge branch 'egomez' into master-qa
Merge pull request #9 from proyecto4-tecdroid/master-qa

Bug Fixes DONE