encryptor and tests
Merge branch 'master' of https://github.com/vshulev/Code-For-Good-Team-16

Conflicts:
	musoni/www/index.html