Initial commit
Merge pull request #1 from renzinho/devel

Primer avance
Version 2
Merge remote-tracking branch 'Dis-devel/devel' into devel