Salsa20 and XSalsa20
Merge pull request #46 from andreasots/salsa20

Salsa20 and XSalsa20