usercontrol borrado
Merge branch 'master' of https://github.com/MiguelAlejandroManterola/PYXIS
FormPrincipal.resx añadido manualmente
Merge branch 'master' of https://github.com/MiguelAlejandroManterola/PYXIS