First commit
Merge https://github.com/hvpareja/Tesis