add encryption and shell scripts to run the programs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.py
crypto file added to vcs