Update cryptokit requirement to the latest
Fix a typo
fix merge conflict
Merge branch 'simplecrypto-master'