Muchas cosas
Merge branch 'master' of https://github.com/alvarogtx300/ERP.git