.
Merge branch 'master' of https://github.com/snowcrystal/cipherjs

Conflicts:
	README.md