Almost finished Shell
Merge pull request #25 from cravacuore/develop

Almost finished Shell
Merge branch 'develop' of https://github.com/GrupoAcertijo/riddler into develop