Merry Christmas!
Merge branch 'master' of github.com:brianPlummer/AndroidEncryptionExample