Merge branch 'hapijoi' of github.com:Korovyov/Storgie into hapijoi
Merge branch 'hapijoi' of github.com:Deconstructed/Storgie into hapijoi
Merge pull request #111 from Adron/hapijoi

Hapijoi