commit
Merge branch 'master' of https://github.com/chollaflower/PasswordManager
resove conflicts