fixed merge conflicts and added ralph's cantaloupe smashing story

Fixes merge conflicts in https://github.com/josmas/RHOST/pull/9