Code ready for presentation.
Merging Alonso's changes with Sebastian's changes.

Merge branch 'master' of github.com:arcoslab/open-coroco