Merge branch 'master' into cli
Merge branch 'cli' of github.com:Segreto/segreto-cli into cli
tried overriding a few things in User, CLI WIP