tesis: cont cap5
Merge branch 'feature' of github.com:azcurraJavier/IDA into feature