Replaced PBKDF2 with SCRYPT
Merge branch 'master' of github.com:amcvega/scrypt-shield