Merge branch 'master' of https://github.com/Kapsyloffer/shobu.rs

Merge branch 'master' of https://github.com/Kapsyloffer/shobu.rs #62