Add newlines to end of files so `cat` works better
Make test instructions work for Python 3 users
Merge pull request #43 from defuse/fix-newlines

Add newlines to end of files so `cat` works better
salted scrypt key, included salt in miniLock ID, and allow user to recreate secret key if they have their passphrase and miniLock ID
updated tests
Merge remote-tracking branch 'upstream/master' into per_user_salt
"Forward secrecy" claim is too strong
Merge pull request #44 from defuse/fix-python3-test-instructions.2

Make test instructions work for Python 3 users
Fix #46
Merge pull request #45 from diafygi/per_user_salt

Add salt to miniLock ID
Move salt pull request to its own branch

This reverts commit 85f134174881c87ff08be3252c351ddfba8954c8, reversing
changes made to 29cfea52f1feff5436e559cd559552d26c8ed993.
Replace scrypt library
Update RESOURCES.md
Update CONTRIBUTING.md
README: Make wording less confusing

Append implies something existing and "analyzing cipertext" implies "not the header".
Merge pull request #51 from ecki/patch-1

README: Make wording less confusing