Merge branch 'master' of github.com:freecoding/naskpass
Merge branch 'master' of github.com:lnslbrty/naskpass