Continue crypto implementation
Merge branch 'master' of https://github.com/phsym/Simple-NoSQL

Conflicts:
	src/crypto.c
	src/crypto.h