looking into joi
merging Subhans and adams changes with mine
cleaning up indenting more
merging conflicts s1
joi
Merge pull request #6 from neapolitan-a-la-code/joi

Joi